diff --git a/lib/tags.js b/lib/tags.js
index d752c760..e450b1ec 100644
--- a/lib/tags.js
+++ b/lib/tags.js
@@ -103,7 +103,12 @@ function getTags (modifiers = {}) {
     'amp-springboard-player': { version: '0.1' },
     'amp-sticky-ad': { version: '1.0' },
     'amp-story': { version: '1.0' },
+    'amp-story-360':  { version: '0.1' },
     'amp-story-auto-ads': { version: '0.1' },
+    'amp-story-auto-analytics': { version: '0.1' },
+    'amp-story-interactive':  { version: '0.1' },
+    'amp-story-panning-media':  { version: '0.1' },
+    'amp-story-player': { version: '0.1' },
     'amp-subscriptions': { version: '0.1' },
     'amp-subscriptions-google': { version: '0.1' },
     'amp-timeago': { version: '0.1' },
@@ -140,7 +145,7 @@ function filterTag (html, tag, { isTemplate, regex }) {
   if (regex) {
     return html.search(regex) > -1
   }
-  return html.includes(`<${tag}`)
+  return html.includes(`<${tag} `)
 }
 
 function generateScript (cdnBase, tag, { isTemplate, script, version }) {