diff --git a/packages/gallery/package.json b/packages/gallery/package.json
index 117820a..66a25ee 100644
--- a/packages/gallery/package.json
+++ b/packages/gallery/package.json
@@ -15,14 +15,15 @@
 		"domvm": "~3.2.0",
 		"exif-parser": "~0.1.9",
 		"pica": "~2.0.8",
-		"pouchdb-adapter-http": "~6.1.2",
-		"pouchdb-adapter-idb": "~6.1.2",
-		"pouchdb-adapter-websql": "~6.1.2",
-		"pouchdb-binary-utils": "~6.1.2",
-		"pouchdb-core": "~6.1.2",
-		"pouchdb-replication": "~6.1.2",
+		"pouchdb-adapter-http": "~6.3.4",
+		"pouchdb-adapter-idb": "~6.3.4",
+		"pouchdb-adapter-websql": "~6.3.4",
+		"pouchdb-binary-utils": "~6.3.4",
+		"pouchdb-core": "~6.3.4",
+		"pouchdb-replication": "~6.3.4",
 		"router": "2.0.0",
-		"webpack": "^2.3.3"
+		"webpack": "~3.8.1",
+		"webpack-dev-server": "~2.9.2"
 	},
 	"devDependencies": {
 		"webpack-dev-server": "~2.4.2"
diff --git a/packages/gallery/src/services/db.js b/packages/gallery/src/services/db.js
index 4637811..e9ca57e 100644
--- a/packages/gallery/src/services/db.js
+++ b/packages/gallery/src/services/db.js
@@ -1,8 +1,14 @@
-const PouchDB = require('pouchdb-core')
-	.plugin(require('pouchdb-adapter-websql'))
-	.plugin(require('pouchdb-adapter-idb'))
-	.plugin(require('pouchdb-adapter-http'))
-	.plugin(require('pouchdb-replication'));
+import core from 'pouchdb-core';
+import idb from 'pouchdb-adapter-idb';
+import http from 'pouchdb-adapter-http';
+import replication from 'pouchdb-replication';
+import find from 'pouchdb-find';
+
+const PouchDB = core
+	.plugin(idb)
+	.plugin(http)
+	.plugin(replication)
+	.plugin(find);
 
 export function generateAttachmentUrl(dbName, docId, attachmentKey) {
 	return `/_doc_attachments/${dbName}/${docId}/${attachmentKey}`;