diff --git a/gridsome.config.js b/gridsome.config.js
index a17196ce9..0f8f1557a 100644
--- a/gridsome.config.js
+++ b/gridsome.config.js
@@ -17,19 +17,19 @@ module.exports = {
             {
               typeName: 'Blog',
               indexName: 'Blog',
-              fields: ['id', 'name', 'title', 'rank', 'excerpt', 'image', 'path', 'datetime', 'author', 'pageInfo']
+              fields: ['path']
             },
   
             {
               typeName: 'Project',
               indexName: 'Project',
-              fields: ['id', 'title', 'rank', 'excerpt', 'image', 'path', 'datetime', 'author', 'pageInfo']
+              fields: ['path']
             },
             
             {
               typeName: 'Person',
               indexName: 'Person',
-              fields: ['id', 'name', 'rank', 'excerpt', 'image', 'path', 'bio', 'pageInfo']
+              fields: ['path']
             },
           ]
         }
diff --git a/gridsome.server.js b/gridsome.server.js
index 554ea1a56..7a852d384 100644
--- a/gridsome.server.js
+++ b/gridsome.server.js
@@ -5,6 +5,12 @@
 // Changes here require a server restart.
 // To restart press CTRL + C in terminal and run `gridsome develop`
 
+var private =  process.env.SHOWPRIVATE
+if (private == "true")
+  private = null
+else if(private == "false")
+  private = 1
+
 module.exports = function (api) {
   api.loadSource(({
     addCollection
@@ -51,6 +57,36 @@ module.exports = function (api) {
     }
   })
 
+    api.createPages(({ createPage }) => {
+      createPage({
+        path: '/people',
+        component: './src/templates/People.vue',
+        context: {
+          private: private
+        }
+      })
+    })
+
+    api.createPages(({ createPage }) => {
+      createPage({
+        path: '/search',
+        component: './src/templates/Search.vue',
+        context: {
+          private: private
+        }
+      })
+    })
+
+    api.createPages(({ createPage }) => {
+      createPage({
+        path: '/projects',
+        component: './src/templates/Projects.vue',
+        context: {
+          private: private
+        }
+      })
+    })
+
     api.createPages(async ({
       graphql,
       createPage
diff --git a/src/pages/News.vue b/src/pages/News.vue
index fea93c8e5..c20e1515b 100644
--- a/src/pages/News.vue
+++ b/src/pages/News.vue
@@ -34,6 +34,7 @@ query{
     edges {
       node {
         title
+        excerpt
         image(width:800)
         path
         humanTime : created(format:"DD MMM YYYY")
diff --git a/src/templates/BlogPost.vue b/src/templates/BlogPost.vue
index b2335c3d9..ba3fbc004 100644
--- a/src/templates/BlogPost.vue
+++ b/src/templates/BlogPost.vue
@@ -119,6 +119,7 @@
       image(width:1600, height:800)
       image_caption
       content
+      excerpt
       humanTime : created(format:"DD MMMM YYYY")
       datetime : created(format:"ddd MMM DD YYYY hh:mm:ss zZ")
       timeToRead
diff --git a/src/pages/People.vue b/src/templates/People.vue
similarity index 88%
rename from src/pages/People.vue
rename to src/templates/People.vue
index dee6c594a..3a16e31e1 100644
--- a/src/pages/People.vue
+++ b/src/templates/People.vue
@@ -10,14 +10,14 @@
 
 <page-query>
 
-query {
-  entries: allPerson (sortBy: "rank", order: DESC){
+query ($private: Int){
+  entries: allPerson (sortBy: "rank", order: DESC, filter: { private: { ne: $private }}){
     totalCount
     edges {
       node {
         path
         excerpt
-        content
+        content 
         name
         rank
         memberships{
diff --git a/src/pages/Projects.vue b/src/templates/Projects.vue
similarity index 91%
rename from src/pages/Projects.vue
rename to src/templates/Projects.vue
index 2d4aec44d..3641b403e 100644
--- a/src/pages/Projects.vue
+++ b/src/templates/Projects.vue
@@ -10,8 +10,8 @@
 
 <page-query>
 
-query {
-  entries: allProject (sortBy: "rank", order: DESC){
+query ($private: Int){
+  entries: allProject (sortBy: "rank", order: DESC, filter: { private: { ne: $private }}){
     totalCount
     edges {
       node {
diff --git a/src/pages/Search.vue b/src/templates/Search.vue
similarity index 95%
rename from src/pages/Search.vue
rename to src/templates/Search.vue
index 6c6c1f21e..d52ea96fb 100644
--- a/src/pages/Search.vue
+++ b/src/templates/Search.vue
@@ -20,8 +20,8 @@
 </template>
 <page-query>
 
-query {
-  projects: allProject {   
+query ($private: Int){
+  projects: allProject (filter: { private: { ne: $private }}){   
     edges {
         node {
                 id
@@ -53,7 +53,7 @@ query {
     }
   }
 
-  people: allPerson {   
+  people: allPerson(filter: { private: { ne: $private }}) {   
      edges {
       node {
         id