diff --git a/debian/control b/debian/control
index 6e53455..02eed63 100644
--- a/debian/control
+++ b/debian/control
@@ -12,3 +12,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Content Manager Assistant for the PS Vita
 
+Package: qcma-headless
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Content Manager Assistant for the PS Vita (headless version)
diff --git a/qcma.pro b/qcma.pro
index 73643c8..6c0c47c 100644
--- a/qcma.pro
+++ b/qcma.pro
@@ -1,8 +1,8 @@
--#-------------------------------------------------
--#
--# Project created by QtCreator 2013-07-23T15:34:17
--#
--#-------------------------------------------------
+#-------------------------------------------------
+#
+# Project created by QtCreator 2013-07-23T15:34:17
+#
+#-------------------------------------------------
 
 TEMPLATE = subdirs
 SUBDIRS = qcma_gui.pro
diff --git a/src/sqlitedb.cpp b/src/sqlitedb.cpp
index 064f42b..d1a582f 100644
--- a/src/sqlitedb.cpp
+++ b/src/sqlitedb.cpp
@@ -880,14 +880,14 @@ bool SQLiteDB::deleteEntry(int ohfi, int root_ohfi)
 
 void SQLiteDB::fillMetadata(const QSqlQuery &query, metadata_t &metadata)
 {
-    metadata.ohfi = query.value("ohfi").toInt();
-    metadata.ohfiParent = query.value("parent").toInt();
-    metadata.name = strdup(query.value("name").toByteArray().constData());
-    metadata.path = strdup(query.value("path").toByteArray().constData());
+    metadata.ohfi = query.value(0).toInt(); // ohfi
+    metadata.ohfiParent = query.value(1).toInt(); // parent
+    metadata.path = strdup(query.value(2).toByteArray().constData()); // path
+    metadata.name = strdup(query.value(3).toByteArray().constData()); // name
     metadata.type = VITA_DIR_TYPE_MASK_REGULAR;
-    metadata.dataType = (DataType)query.value("data_type").toInt();
-    metadata.size = query.value("size").toULongLong();
-    metadata.dateTimeCreated = query.value("date_created").toInt();
+    metadata.dataType = (DataType)query.value(5).toInt(); // data_type
+    metadata.size = query.value(6).toULongLong(); // size
+    metadata.dateTimeCreated = query.value(7).toInt(); // date_created
     metadata.next_metadata = NULL;
     //TODO: fill the rest of the metadata
 }