Index: trackerd/tracker-db-sqlite.c
===================================================================
--- trackerd/tracker-db-sqlite.c	(revision 850)
+++ trackerd/tracker-db-sqlite.c	(working copy)
@@ -5978,7 +5978,7 @@
 
 						if (strcasecmp (*array2, "Parent") == 0) {
 
-							tracker_exec_proc (db_con, "InsertMetaDataChildren", 2, str_id, value);		
+							tracker_exec_proc (db_con, "InsertMetaDataChildren", 2, value, str_id);		
 
 						} else if (strcasecmp (*array2, "DataType") == 0) {
 
Index: tracker-extract/tracker-extract-html.c
===================================================================
--- tracker-extract/tracker-extract-html.c	(revision 850)
+++ tracker-extract/tracker-extract-html.c	(working copy)
@@ -113,6 +113,15 @@
 				                     g_strdup( (char*)desc ));
 			}
 		}
+
+            if ( has_attribute(atts, "name", "KEYWORDS") || has_attribute(atts, "name", "keywords") ) {
+									
+			const xmlChar *keywords = lookup_attribute(atts, "content");
+			if ( keywords ) {
+				g_hash_table_insert (((HTMLParseInfo *)info)->metadata, g_strdup ("Doc:Keywords"),
+							   g_strdup((char*) keywords));			
+			}					
+		}
 	}
 }
 
