diff --git a/gridsome.config.js b/gridsome.config.js
index 007a1340d..8dbdc03ea 100644
--- a/gridsome.config.js
+++ b/gridsome.config.js
@@ -17,19 +17,19 @@ module.exports = {
             {
               typeName: 'Blog',
               indexName: 'Blog',
-              fields: ['name', 'title', 'rank', 'excerpt', 'image', 'path', 'datetime', 'author', 'pageInfo']
+              fields: ['id', 'name', 'title', 'rank', 'excerpt', 'image', 'path', 'datetime', 'author', 'pageInfo']
             },
   
             {
               typeName: 'Project',
               indexName: 'Project',
-              fields: ['title', 'rank', 'excerpt', 'image', 'path', 'datetime', 'author', 'pageInfo']
+              fields: ['id', 'title', 'rank', 'excerpt', 'image', 'path', 'datetime', 'author', 'pageInfo']
             },
             
             {
               typeName: 'Person',
               indexName: 'Person',
-              fields: ['name', 'rank', 'excerpt', 'image', 'path', 'bio', 'pageInfo']
+              fields: ['id', 'name', 'rank', 'excerpt', 'image', 'path', 'bio', 'pageInfo']
             },
           ]
         }
diff --git a/src/pages/Search.vue b/src/pages/Search.vue
index cc6845d34..7e1d34c09 100644
--- a/src/pages/Search.vue
+++ b/src/pages/Search.vue
@@ -2,24 +2,99 @@
   <Layout>
     <div class="container sm:pxi-0 mx-auto overflow-x-hidden">
       <div class="flex flex-wrap with-large pt-8 pb-8 mx-4 sm:-mx-4">
-        <!-- <PostListItem
+        <PostListItem
           v-for="edge in searchResults"
           :key="edge.node.id"
           :record="edge.node"
-        /> -->
+        />
       </div>
     </div>
-    <!-- <div class="pagination flex justify-center mb-8">
-        <Pagination
-          :baseUrl="baseurl"
-          :currentPage="searchResults.pageInfo.currentPage"
-          :totalPages="searchResults.pageInfo.totalPages"
-          :maxVisibleButtons="5"
-          v-if="searchResults.pageInfo.totalPages > 1"
-        />
-      </div> -->
-  </Layout>
+</Layout>
 </template>
+<page-query>
+
+query {
+  projects: allProject {   
+    edges {
+      node {
+        id
+        title
+        path
+        members {
+          id
+          name
+          image(width:64, height:64, fit:inside)
+          path
+      }
+        rank
+        linkedin
+        startDate : startdate(format:"MM YYYY")
+        humanTime : created(format:"DD MMMM YYYY")
+        datetime : created(format:"ddd MMM DD YYYY hh:mm:ss zZ")
+        status
+        excerpt
+        image(width:800)
+        path
+        timeToRead
+        author {
+          id
+          
+          image(width:64, height:64, fit:inside)
+          path
+        }
+      }
+    }
+  }
+
+  people: allPerson {   
+     edges {
+      node {
+        id
+        path
+        excerpt
+        content
+        name
+        rank
+        memberships
+        bio
+        linkedin
+        websites
+        project_ids
+        countries
+        cities
+        image(width:800)
+        private
+      }
+    }
+  }
+
+  blogs: allBlog {
+    edges {
+      node {
+        id
+        name
+        title
+        team
+        rank
+        excerpt
+        image(width:800)
+        path
+        timeToRead
+        humanTime : created(format:"DD MMM YYYY")
+        datetime : created
+        author {
+          id
+          name
+          image(width:64, height:64, fit:inside)
+          path
+        }
+      }
+    }
+  }
+
+}
+
+</page-query>
 
 <script>
 import PostListItem from "~/components/PostListItem.vue";
@@ -31,16 +106,39 @@ export default {
   },
   data: () => ({
     q: "",
+    objects : {},
   }),
   computed: {
     searchResults() {
       const searchTerm = this.q;
       if (searchTerm.length < 3) return [];
-      return this.$search.search({ query: searchTerm, limit: 5 });
+      var searchRes = this.$search.search({ query: searchTerm, limit: 5 });
+      var result = []
+      for (var i = 0; i < searchRes.length; i++){
+        var item = searchRes[i]
+        result.push({"node" : this.objects[item.path]})
+      }
+      return result
     },
   },
   mounted() {
     this.q = new URL(location.href).searchParams.get("query");
+    
+    for(var i=0; i < this.$page.projects.edges.length; i++){
+      var item = this.$page.projects.edges[i]
+      this.objects[item.node.path] = item.node
+    }
+
+    for(var i=0; i < this.$page.people.edges.length; i++){
+      var item = this.$page.people.edges[i]
+      this.objects[item.node.path] = item.node
+    }
+
+    for(var i=0; i < this.$page.blogs.edges.length; i++){
+      var item = this.$page.blogs.edges[i]
+      this.objects[item.node.path] = item.node
+    }
+
   },
   components: {
     PostListItem,