diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92cf4ad8..6f283427 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,8 +16,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - **Configuration Wizard**: Git version detection no longer fails on MacOS
 - **Init**: Malformed config file is now being reported correctly
-- **UI**: Scrollbar is no longer always shown in code blocks
+- **Init**: Git remote is now always updated to current settings
 - **Misc**: CJK (Chinese, Japanese & Korean) characters are now fully supported for pages, content and uploads
+- **UI**: Scrollbar is no longer always shown in code blocks
+- **Search**: Search is now working for guest users when public mode is enabled
 
 ## [v1.0.0-beta.10] - 2017-04-08
 ### Added
diff --git a/controllers/ws.js b/controllers/ws.js
index f66a3667..7ce016fc 100644
--- a/controllers/ws.js
+++ b/controllers/ws.js
@@ -5,93 +5,93 @@
 const _ = require('lodash')
 
 module.exports = (socket) => {
-  if (!socket.request.user.logged_in) {
-    return
-  }
-
   // -----------------------------------------
   // SEARCH
   // -----------------------------------------
 
-  socket.on('search', (data, cb) => {
-    cb = cb || _.noop
-    search.find(data.terms).then((results) => {
-      return cb(results) || true
+  if (appconfig.public || socket.request.user.logged_in) {
+    socket.on('search', (data, cb) => {
+      cb = cb || _.noop
+      search.find(data.terms).then((results) => {
+        return cb(results) || true
+      })
     })
-  })
+  }
 
   // -----------------------------------------
   // UPLOADS
   // -----------------------------------------
 
-  socket.on('uploadsGetFolders', (data, cb) => {
-    cb = cb || _.noop
-    upl.getUploadsFolders().then((f) => {
-      return cb(f) || true
+  if (socket.request.user.logged_in) {
+    socket.on('uploadsGetFolders', (data, cb) => {
+      cb = cb || _.noop
+      upl.getUploadsFolders().then((f) => {
+        return cb(f) || true
+      })
     })
-  })
 
-  socket.on('uploadsCreateFolder', (data, cb) => {
-    cb = cb || _.noop
-    upl.createUploadsFolder(data.foldername).then((f) => {
-      return cb(f) || true
+    socket.on('uploadsCreateFolder', (data, cb) => {
+      cb = cb || _.noop
+      upl.createUploadsFolder(data.foldername).then((f) => {
+        return cb(f) || true
+      })
     })
-  })
 
-  socket.on('uploadsGetImages', (data, cb) => {
-    cb = cb || _.noop
-    upl.getUploadsFiles('image', data.folder).then((f) => {
-      return cb(f) || true
+    socket.on('uploadsGetImages', (data, cb) => {
+      cb = cb || _.noop
+      upl.getUploadsFiles('image', data.folder).then((f) => {
+        return cb(f) || true
+      })
     })
-  })
 
-  socket.on('uploadsGetFiles', (data, cb) => {
-    cb = cb || _.noop
-    upl.getUploadsFiles('binary', data.folder).then((f) => {
-      return cb(f) || true
+    socket.on('uploadsGetFiles', (data, cb) => {
+      cb = cb || _.noop
+      upl.getUploadsFiles('binary', data.folder).then((f) => {
+        return cb(f) || true
+      })
     })
-  })
 
-  socket.on('uploadsDeleteFile', (data, cb) => {
-    cb = cb || _.noop
-    upl.deleteUploadsFile(data.uid).then((f) => {
-      return cb(f) || true
+    socket.on('uploadsDeleteFile', (data, cb) => {
+      cb = cb || _.noop
+      upl.deleteUploadsFile(data.uid).then((f) => {
+        return cb(f) || true
+      })
     })
-  })
 
-  socket.on('uploadsFetchFileFromURL', (data, cb) => {
-    cb = cb || _.noop
-    upl.downloadFromUrl(data.folder, data.fetchUrl).then((f) => {
-      return cb({ ok: true }) || true
-    }).catch((err) => {
-      return cb({
-        ok: false,
-        msg: err.message
-      }) || true
+    socket.on('uploadsFetchFileFromURL', (data, cb) => {
+      cb = cb || _.noop
+      upl.downloadFromUrl(data.folder, data.fetchUrl).then((f) => {
+        return cb({ ok: true }) || true
+      }).catch((err) => {
+        return cb({
+          ok: false,
+          msg: err.message
+        }) || true
+      })
     })
-  })
 
-  socket.on('uploadsRenameFile', (data, cb) => {
-    cb = cb || _.noop
-    upl.moveUploadsFile(data.uid, data.folder, data.filename).then((f) => {
-      return cb({ ok: true }) || true
-    }).catch((err) => {
-      return cb({
-        ok: false,
-        msg: err.message
-      }) || true
+    socket.on('uploadsRenameFile', (data, cb) => {
+      cb = cb || _.noop
+      upl.moveUploadsFile(data.uid, data.folder, data.filename).then((f) => {
+        return cb({ ok: true }) || true
+      }).catch((err) => {
+        return cb({
+          ok: false,
+          msg: err.message
+        }) || true
+      })
     })
-  })
 
-  socket.on('uploadsMoveFile', (data, cb) => {
-    cb = cb || _.noop
-    upl.moveUploadsFile(data.uid, data.folder).then((f) => {
-      return cb({ ok: true }) || true
-    }).catch((err) => {
-      return cb({
-        ok: false,
-        msg: err.message
-      }) || true
+    socket.on('uploadsMoveFile', (data, cb) => {
+      cb = cb || _.noop
+      upl.moveUploadsFile(data.uid, data.folder).then((f) => {
+        return cb({ ok: true }) || true
+      }).catch((err) => {
+        return cb({
+          ok: false,
+          msg: err.message
+        }) || true
+      })
     })
-  })
+  }
 }
diff --git a/views/layout.pug b/views/layout.pug
index 5f52c3aa..0e08a9a8 100644
--- a/views/layout.pug
+++ b/views/layout.pug
@@ -18,8 +18,6 @@ html
     link(rel='manifest', href='/manifest.json')
 
     // JS / CSS
-    //script(type='text/javascript').
-      
     script(type='text/javascript', src='/js/bundle.min.js')
 
     block head