Index: src/tracker-extract/tracker-extract-html.c
===================================================================
--- src/tracker-extract/tracker-extract-html.c	(revision 850)
+++ src/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));			
+			}					
+		}
 	}
 }
 
Index: data/sqlite-stored-procs.sql
===================================================================
--- data/sqlite-stored-procs.sql	(revision 850)
+++ data/sqlite-stored-procs.sql	(working copy)
@@ -100,7 +100,7 @@
 GetWriteableMetadataTypes SELECT ID, MetaName, DataTypeID, DisplayName, Description, Enabled, UIVisible, FieldName, Weight, Embedded, MultipleValues, Delimited, Filtered, Abstract FROM MetaDataTypes where Embedded = 0;
 GetWriteableMetadataTypesLike SELECT ID, MetaName, DataTypeID, DisplayName, Description, Enabled, UIVisible, FieldName, Weight, Embedded, MultipleValues, Delimited, Filtered, Abstract FROM MetaDataTypes WHERE MetaName glob ? and  Embedded = 0;
 
-InsertMetaDataChildren INSERT INTO  MetaDataChildren (MetadataID, ChildID) VALUES (?,(select ID from MetaDataTypes where MetaName = ?));
+InsertMetaDataChildren INSERT INTO  MetaDataChildren (ChildID,MetadataID) VALUES (?,(select ID from MetaDataTypes where MetaName = ?));
 GetMetadataAliases SELECT distinct M.MetaName, M.ID from MetaDataTypes M, MetaDataChildren C where M.ID = C.ChildID and C.MetaDataID = ?; 
 GetMetadataAliasesForName SELECT distinct M.MetaName, M.ID from MetaDataTypes M, MetaDataChildren C where M.ID = C.ChildID and C.MetaDataID = (select ID from MetaDataTypes where MetaName = ?) union select M.MetaName, M.ID from MetaDataTypes M where M.MetaName = ?; 
 
