diff --git a/_data/metadata.json b/_data/metadata.json
index 9ce0ad2..415d5e7 100644
--- a/_data/metadata.json
+++ b/_data/metadata.json
@@ -11,9 +11,5 @@
   "author": {
     "name": "Your Name Here",
     "email": "youremailaddress@example.com"
-  },
-  "tagPages": [
-    "another-tag",
-    "second-tag"
-  ]
+  }
 }
diff --git a/_includes/postslist.njk b/_includes/postslist.njk
index 4a49021..f6d6c0a 100644
--- a/_includes/postslist.njk
+++ b/_includes/postslist.njk
@@ -1,10 +1,10 @@
 <ol class="postlist" style="counter-reset: start-from {{ postslist.length + 1 }}">
 {% for post in postslist | reverse %}
 	<li class="postlist-item{% if post.url == url %} postlist-item-active{% endif %}">
-		<a href="{{ post.url | url }}" class="postlist-link">{{ post.data.title }}</a>
+		<a href="{{ post.url | url }}" class="postlist-link">{% if post.data.title %}{{ post.data.title }}{% else %}<code>{{ post.url }}</code>{% endif %}</a>
 		<span class="postlist-date">{{ post.date | readableDate }}</span>
 		{% for tag in post.data.tags %}
-      {%- if tag != "post" and metadata.tagPages.indexOf(tag) > -1 -%}
+      {%- if tag != "post" -%}
       {% set tagUrl %}/tags/{{ tag }}/{% endset %}
       <a href="{{ tagUrl | url }}" class="tag">{{ tag }}</a>
       {%- endif -%}
diff --git a/about/index.md b/about/index.md
index be5d26c..4ccc204 100644
--- a/about/index.md
+++ b/about/index.md
@@ -1,9 +1,10 @@
 ---
 layout: layouts/post.njk
 title: About Me
-tags: nav
+tags:
+  - nav
 navtitle: About
 templateClass: tmpl-post
 ---
 
-I am a person that writes stuff.
\ No newline at end of file
+I am a person that writes stuff.
diff --git a/index.njk b/index.njk
index 3312d9b..70159be 100644
--- a/index.njk
+++ b/index.njk
@@ -1,6 +1,7 @@
 ---
 layout: layouts/home.njk
-tags: nav
+tags:
+  - nav
 navtitle: Home
 ---
 
diff --git a/package.json b/package.json
index f13c129..7a7e81d 100644
--- a/package.json
+++ b/package.json
@@ -21,8 +21,8 @@
     "url": "https://github.com/11ty/eleventy-base-blog/issues"
   },
   "homepage": "https://github.com/11ty/eleventy-base-blog#readme",
-  "dependencies": {
-    "@11ty/eleventy": "^0.3.6",
+  "devDependencies": {
+    "@11ty/eleventy": "^0.4.0",
     "@11ty/eleventy-plugin-rss": "^1.0.2",
     "@11ty/eleventy-plugin-syntaxhighlight": "^1.0.5",
     "luxon": "^1.0.0",
diff --git a/tags.njk b/tags.njk
index 9aacb09..32cf598 100644
--- a/tags.njk
+++ b/tags.njk
@@ -1,8 +1,13 @@
 ---
 pagination:
-  data: metadata.tagPages
+  data: collections
   size: 1
   alias: tag
+  filter:
+    - all
+    - nav
+    - post
+    - posts
 permalink: /tags/{{ tag }}/
 layout: layouts/home.njk
 ---