diff --git a/controller/search.js b/controller/search.js
index e396c78e..3e9b3e4a 100644
--- a/controller/search.js
+++ b/controller/search.js
@@ -21,7 +21,7 @@ function setup( backend, query ){
       // handle backend errors
       if( err ){ return next( err ); }
 
-      if( data && data.hits && data.hits.total){
+      if( data && data.hits && data.hits.total && Array.isArray(data.hits.hits)){
         docs = data.hits.hits.map( function( hit ){
           return hit._source;
         });
diff --git a/query/search.js b/query/search.js
index a504acf4..9b70e008 100644
--- a/query/search.js
+++ b/query/search.js
@@ -2,7 +2,7 @@ var logger = require('../src/logger');
 
 // Build pelias search query
 function generate( params ){
-  
+
   var cmd = {
     "query":{
       "filtered" : {
@@ -15,8 +15,8 @@ function generate( params ){
             "geo_distance" : {
                 "distance" : "200km",
                 "center_point" : {
-                  "lat": params.lat, 
-                  "lon": params.lon 
+                  "lat": params.lat,
+                  "lon": params.lon
                 }
             }
         }
@@ -25,7 +25,7 @@ function generate( params ){
     "size": params.size
   };
 
-  logger.log( 'cmd', JSON.stringify( cmd, null, 2 ) );
+  // logger.log( 'cmd', JSON.stringify( cmd, null, 2 ) );
   return cmd;
 
 }