diff --git a/Makefile b/Makefile
index 77ef26a..2951f5b 100644
--- a/Makefile
+++ b/Makefile
@@ -36,14 +36,15 @@ $(databases): .dbs/%.rec: %/
 	done > $@
 	for entry in $(shell find $< -type f -name "*.md"); do \
 		recset $@ -e "file = '$${entry}'" -f wordcount --set-add="$$(wc -w < $${entry})" ;\
-		recset $@ -e "file = '$${entry}'" -f contents --set-add="$$($(spill_contents) $${entry})" ;\
+		recset $@ -e "file = '$${entry}'" -f content --set-add="$$($(spill_contents) $${entry})" ;\
 	done
 
 db.rec: $(databases)
 	printf '%s\n' '%rec: guide' > $@
+	printf '%s\n' '%key: title' >> $@
 	printf '%s\n' '%type: wordcount int' >> $@
 	printf '%s\n\n' '%sort: title' >> $@
-	cat $^ >> $@
+	recsel $^ >> $@
 	recsel $@ -e "requires != ''" -CR title,requires |\
 	while read title requires; do \
 		IFS=', ' && for provider in $$requires; do \
diff --git a/data/git/subtree.md b/data/git/subtree.md
index b467954..e44e888 100644
--- a/data/git/subtree.md
+++ b/data/git/subtree.md
@@ -1,5 +1,5 @@
 ---
-title: "git"
+title: "git subtree"
 tags: [ "data", "git", "subtree" ]
 ---
 
diff --git a/data/gpg/extras.md b/data/gpg/extras.md
index 981af5b..542d195 100644
--- a/data/gpg/extras.md
+++ b/data/gpg/extras.md
@@ -1,5 +1,5 @@
 ---
-title: "gpg"
+title: "gpg with vim"
 tags: [ "vim", "data", "GPG" ]
 requires: [ "GPG Basics", "vim basics" ]
 ---
diff --git a/system/Makefiles/help.md b/system/Makefiles/help.md
index e4f4cce..c3e4c62 100644
--- a/system/Makefiles/help.md
+++ b/system/Makefiles/help.md
@@ -1,5 +1,5 @@
 ---
-title: "Makefiles"
+title: "make help target"
 tags: [ "system", "make", "help" ]
 ---