diff --git a/package.json b/package.json
index 87537e4..e93b931 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "morgan": "^1.3.1",
     "node-uuid": "^1.4.2",
     "pluralize": "^1.1.2",
+    "underscore": "^1.8.3",
     "underscore-db": "^0.8.0",
     "update-notifier": "^0.2.2",
     "yargs": "^1.3.1"
diff --git a/src/router.js b/src/router.js
index fb5d65f..70c409b 100644
--- a/src/router.js
+++ b/src/router.js
@@ -1,7 +1,7 @@
 var express = require('express')
 var methodOverride = require('method-override')
 var bodyParser = require('body-parser')
-var _ = require('lodash')
+var _ = require('underscore')
 var low = require('lowdb')
 var pluralize = require('pluralize')
 var utils = require('./utils')
@@ -101,7 +101,8 @@ module.exports = function (source) {
           filters[key] = utils.toNative(req.query[key])
         }
       }
-
+      console.log(filters)
+      console.log()
       // Filter
       if (_(filters).isEmpty()) {
         array = db(req.params.resource).value()
diff --git a/src/utils.js b/src/utils.js
index 65daaf6..5021962 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -1,4 +1,4 @@
-var _ = require('lodash')
+var _ = require('underscore')
 var uuid = require('node-uuid')
 var pluralize = require('pluralize')
 
@@ -44,7 +44,7 @@ function createId (coll) {
 // Example: a comment that references a post that doesn't exist
 function getRemovable (db) {
   var removable = []
-
+  console.log(db)
   _(db).each(function (coll, collName) {
     _(coll).each(function (doc) {
       _(doc).each(function (value, key) {
@@ -67,14 +67,14 @@ function getRemovable (db) {
 }
 
 function deepQuery (value, q) {
-  if (value) {
+  if (value && q) {
     if (_.isArray(value)) {
       for (var i = 0; i < value.length; i++) {
         if (deepQuery(value[i], q)) {
           return true
         }
       }
-    } else if (_.isPlainObject(value)) {
+    } else if (_.isObject(value) && !_.isArray(value)) {
       for (var k in value) {
         if (deepQuery(value[k], q)) {
           return true