diff --git a/gatsby-node.js b/gatsby-node.js
index 9a8fc3304..5ca532f28 100644
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -188,7 +188,7 @@ exports.createPages = ({ graphql, actions }) => {
     const snippets = result.data.allSnippet.edges;
 
     snippets.forEach(snippet => {
-      if(!snippet.archived) {
+      if (!snippet.node.archived) {
         createPage({
           path: `/snippet${snippet.node.slug}`,
           component: snippetPage,
@@ -210,7 +210,11 @@ exports.createPages = ({ graphql, actions }) => {
     });
 
     // Create tag pages.
-    const tags = [...new Set(snippets.map(snippet => snippet.tags.primary))].sort((a,b) => a.localeCompare(b));
+    const tags = [...new Set(
+      snippets.map(snippet => (snippet.tags || {primary: null}).primary)
+    )]
+      .filter(Boolean)
+      .sort((a, b) => a.localeCompare(b));
 
     tags.forEach(tag => {
       const tagPath = `/tag/${toKebabCase(tag)}/`;
diff --git a/src/docs/components/SnippetCard.js b/src/docs/components/SnippetCard.js
index e2088ec20..0b02ab6e4 100644
--- a/src/docs/components/SnippetCard.js
+++ b/src/docs/components/SnippetCard.js
@@ -42,24 +42,18 @@ const CardCorner = ({ difficulty = 'intermediate' }) => (
 // ===================================================
 const FullCard = ({ snippetData, difficulty, isDarkMode }) => {
   const [examplesOpen, setExamplesOpen] = React.useState(false);
-  const tags = snippetData.tags;
-  let cardCodeHtml = `${optimizeAllNodes(
-    getCodeBlocks(snippetData.html).code,
-  )}`;
-  let cardExamplesHtml = `${optimizeAllNodes(
-    getCodeBlocks(snippetData.html).example,
-  )}`;
+
   return (
     <div className='card'>
       <CardCorner difficulty={difficulty} />
       <h4 className='card-title'>{snippetData.title}</h4>
-      {tags.map(tag => (
+      {snippetData.tags.map(tag => (
         <span className='tag' key={`tag_${tag}`}>{tag}</span>
       ))}
       <div
         className='card-description'
         dangerouslySetInnerHTML={{
-          __html: `${getTextualContent(snippetData.html)}`,
+          __html: snippetData.textHtml,
         }}
       />
       <div className='card-bottom'>
@@ -83,12 +77,9 @@ const FullCard = ({ snippetData, difficulty, isDarkMode }) => {
             aria-label='Copy to clipboard'
           />
         </CopyToClipboard>
-        {/* <button className="button button-b button-social-sh" aria-label="Share">
-          <ShareIcon />
-        </button> */}
         <pre
           className={`card-code language-${config.language}`}
-          dangerouslySetInnerHTML={{ __html: cardCodeHtml }}
+          dangerouslySetInnerHTML={{ __html: snippetData.codeHtml }}
         />
         <button
           className='button button-example-toggler'
@@ -99,7 +90,7 @@ const FullCard = ({ snippetData, difficulty, isDarkMode }) => {
           {examplesOpen && (
             <pre
               className='section card-examples language-js'
-              dangerouslySetInnerHTML={{ __html: cardExamplesHtml }}
+              dangerouslySetInnerHTML={{ __html: snippetData.exampleHtml }}
             />
           )}
       </div>
diff --git a/src/docs/templates/SnippetPage.js b/src/docs/templates/SnippetPage.js
index 996e996f8..9ab06301c 100644
--- a/src/docs/templates/SnippetPage.js
+++ b/src/docs/templates/SnippetPage.js
@@ -11,14 +11,11 @@ import BackArrowIcon from '../components/SVGs/BackArrowIcon';
 // Individual snippet page template
 // ===================================================
 const SnippetPage = props => {
-  const post = props.data.markdownRemark;
-  const postData = props.data.snippetDataJson.data.find(
-    v => v.title === post.frontmatter.title,
-  );
+  const snippet = props.data.snippet;
 
   return (
     <>
-      <Meta title={post.frontmatter.title} description={post.excerpt} />
+      <Meta title={snippet.title} description={snippet.text.short} />
       <Shell>
         <Link
           className='link-back'
@@ -29,10 +26,13 @@ const SnippetPage = props => {
         </Link>
         <SnippetCard
           snippetData={{
-            title: postData.title,
-            html: post.html,
-            code: postData.attributes.codeBlocks.code,
-            tags: postData.attributes.tags,
+            title: snippet.title,
+            html: snippet.html.full,
+            codeHtml: snippet.html.code,
+            exampleHtml: snippet.html.example,
+            textHtml: snippet.html.text,
+            code: snippet.code.src,
+            tags: snippet.tags.all,
           }}
           isDarkMode={props.isDarkMode}
         />
@@ -52,7 +52,7 @@ export default connect(
 )(SnippetPage);
 
 export const pageQuery = graphql`
-  query BlogPostBySlug($slug: String!, $scope: String!) {
+  query SnippetBySlug($slug: String!) {
     logo: file(absolutePath: { regex: "/logo_reverse_md.png/" }) {
       id
       childImageSharp {
@@ -61,42 +61,23 @@ export const pageQuery = graphql`
         }
       }
     }
-    allMarkdownRemark {
-      edges {
-        node {
-          fields {
-            slug
-          }
-          fileAbsolutePath
-          frontmatter {
-            title
-          }
-        }
+    snippet (slug: {eq: $slug }) {
+      title
+      html {
+        full
+        code
+        example
+        text
       }
-    }
-    markdownRemark(fields: { slug: { eq: $slug } }) {
-      id
-      fields {
-        slug
+      code {
+        src
       }
-      excerpt(pruneLength: 160)
-      html
-      frontmatter {
-        title
+      tags {
+        all
       }
-    }
-    snippetDataJson(meta: { type: { eq: "snippetArray" }, scope: {eq: $scope} }) {
-      data {
-        title
-        id
-        attributes {
-          text
-          codeBlocks {
-            es6
-            example
-          }
-          tags
-        }
+      title
+      text {
+        short
       }
     }
   }