diff --git a/docs/search/success.md b/docs/search/success.md
index 31e47a39..2b4eb422 100644
--- a/docs/search/success.md
+++ b/docs/search/success.md
@@ -1,6 +1,6 @@
 # valid search query
 
-*Generated: Wed Sep 17 2014 16:05:27 GMT-0400 (EDT)*
+*Generated: Wed Sep 17 2014 17:51:29 GMT-0400 (EDT)*
 ## Request
 ```javascript
 {
@@ -8,7 +8,7 @@
   "host": "localhost",
   "method": "GET",
   "port": 3100,
-  "path": "/search?input=z&lat=0&lon=0"
+  "path": "/search?input=lake&lat=29.49136&lon=-82.50622"
 }
 ```
 
@@ -25,304 +25,674 @@ Status: 200
   "access-control-allow-headers": "X-Requested-With,content-type",
   "access-control-allow-credentials": "true",
   "content-type": "application/json; charset=utf-8",
-  "content-length": "4459",
-  "etag": "W/\"PY7aB5FehG8OpkYGve7zQg==\"",
-  "date": "Wed, 17 Sep 2014 20:05:27 GMT",
+  "content-length": "9257",
+  "etag": "W/\"OND3fubDpKm+gxn7v+gcfQ==\"",
+  "date": "Wed, 17 Sep 2014 21:51:29 GMT",
   "connection": "close"
 }
 ```
 ```javascript
 {
-  "date": 1410984327401,
+  "date": 1410990689582,
   "body": [
     {
       "name": {
-        "default": "Lazy C-Z Reservoir"
+        "default": "Bluff Lake"
       },
       "admin0": "United States",
-      "admin1": "Texas",
-      "admin2": "Brazoria County",
+      "admin1": "Georgia",
+      "admin2": "Charlton County",
       "center_point": {
-        "lat": "29.23763",
-        "lon": "-95.32676"
+        "lat": "30.87884",
+        "lon": "-82.1479"
       },
       "suggest": {
         "input": [
-          "lazy c-z reservoir"
+          "bluff lake"
         ],
         "payload": {
-          "id": "geoname/4705663",
-          "geo": "-95.32676,29.23763"
+          "id": "geoname/4047948",
+          "geo": "-82.1479,30.87884"
         },
-        "output": "Lazy C-Z Reservoir, Brazoria County, United States"
+        "output": "Bluff Lake, Charlton County, United States"
       }
     },
     {
       "name": {
-        "default": "Z Loggans Bar"
+        "default": "Lake Midget"
       },
       "admin0": "United States",
-      "admin1": "Alabama",
-      "admin2": "Hale County",
+      "admin1": "Florida",
+      "admin2": "Polk County",
       "center_point": {
-        "lat": "32.89596",
-        "lon": "-87.80501"
+        "lat": "28.04302",
+        "lon": "-81.57802"
       },
       "suggest": {
         "input": [
-          "z loggans bar"
+          "lake midget"
         ],
         "payload": {
-          "id": "geoname/4098848",
-          "geo": "-87.80501,32.89596"
+          "id": "geoname/4047858",
+          "geo": "-81.57802,28.04302"
         },
-        "output": "Z Loggans Bar, Hale County, United States"
+        "output": "Lake Midget, Polk County, United States"
       }
     },
     {
       "name": {
-        "default": "Z Loggans Landing (historical)"
+        "default": "Seagrove Lake"
       },
       "admin0": "United States",
-      "admin1": "Alabama",
-      "admin2": "Greene County",
+      "admin1": "Georgia",
+      "admin2": "Ware County",
       "center_point": {
-        "lat": "32.89929",
-        "lon": "-87.80418"
+        "lat": "30.70884",
+        "lon": "-82.17151"
       },
       "suggest": {
         "input": [
-          "z loggans landing (historical)"
+          "seagrove lake"
         ],
         "payload": {
-          "id": "geoname/4098849",
-          "geo": "-87.80418,32.89929"
+          "id": "geoname/4221821",
+          "geo": "-82.17151,30.70884"
         },
-        "output": "Z Loggans Landing (historical), Greene County, United States"
+        "output": "Seagrove Lake, Ware County, United States"
       }
     },
     {
       "name": {
-        "default": "Piney Z Lake"
+        "default": "Wilkerson Lake"
       },
       "admin0": "United States",
-      "admin1": "Florida",
-      "admin2": "Leon County",
+      "admin1": "Georgia",
+      "admin2": "Clinch County",
       "center_point": {
-        "lat": "30.44353",
-        "lon": "-84.19184"
+        "lat": "30.76827",
+        "lon": "-82.80764"
       },
       "suggest": {
         "input": [
-          "piney z lake"
+          "wilkerson lake"
         ],
         "payload": {
-          "id": "geoname/4168700",
-          "geo": "-84.19184,30.44353"
+          "id": "geoname/4231020",
+          "geo": "-82.80764,30.76827"
         },
-        "output": "Piney Z Lake, Leon County, United States"
+        "output": "Wilkerson Lake, Clinch County, United States"
       }
     },
     {
       "name": {
-        "default": "H Z Smith Lake"
+        "default": "Sunset Lake"
       },
       "admin0": "United States",
       "admin1": "Georgia",
-      "admin2": "Bulloch County",
+      "admin2": "Lowndes County",
       "center_point": {
-        "lat": "32.47721",
-        "lon": "-81.83116"
+        "lat": "30.65978",
+        "lon": "-83.25091"
       },
       "suggest": {
         "input": [
-          "h z smith lake"
+          "sunset lake"
         ],
         "payload": {
-          "id": "geoname/4198672",
-          "geo": "-81.83116,32.47721"
+          "id": "geoname/4225258",
+          "geo": "-83.25091,30.65978"
         },
-        "output": "H Z Smith Lake, Bulloch County, United States"
+        "output": "Sunset Lake, Lowndes County, United States"
       }
     },
     {
       "name": {
-        "default": "J Z Miller House"
+        "default": "Lake Wilson"
       },
       "admin0": "United States",
-      "admin1": "Texas",
-      "admin2": "Bell County",
+      "admin1": "Florida",
+      "admin2": "Osceola County",
       "center_point": {
-        "lat": "31.06324",
-        "lon": "-97.45945"
+        "lat": "28.3353",
+        "lon": "-81.59836"
       },
       "suggest": {
         "input": [
-          "j z miller house"
+          "lake wilson"
         ],
         "payload": {
-          "id": "geoname/4700378",
-          "geo": "-97.45945,31.06324"
+          "id": "geoname/4178484",
+          "geo": "-81.59836,28.3353"
         },
-        "output": "J Z Miller House, Bell County, United States"
+        "output": "Lake Wilson, Osceola County, United States"
       }
     },
     {
       "name": {
-        "default": "Z Kingsley Grant"
+        "default": "Lake Willisara"
       },
       "admin0": "United States",
       "admin1": "Florida",
-      "admin2": "Duval County",
+      "admin2": "Orange County",
       "center_point": {
-        "lat": "30.24191",
-        "lon": "-81.62204"
+        "lat": "28.50804",
+        "lon": "-81.3612"
       },
       "suggest": {
         "input": [
-          "z kingsley grant"
+          "lake willisara"
         ],
         "payload": {
-          "id": "geoname/4178927",
-          "geo": "-81.62204,30.24191"
+          "id": "geoname/4178413",
+          "geo": "-81.3612,28.50804"
         },
-        "output": "Z Kingsley Grant, Duval County, United States"
+        "output": "Lake Willisara, Orange County, United States"
       }
     },
     {
       "name": {
-        "default": "L-Z Bravo Airport"
+        "default": "Church Lake"
       },
       "admin0": "United States",
-      "admin1": "Missouri",
-      "admin2": "Monroe County",
+      "admin1": "Florida",
+      "admin2": "Putnam County",
       "center_point": {
-        "lat": "39.63615",
-        "lon": "-92.16712"
+        "lat": "29.65132",
+        "lon": "-81.86765"
       },
       "suggest": {
         "input": [
-          "l-z bravo airport"
+          "church lake"
         ],
         "payload": {
-          "id": "geoname/4393970",
-          "geo": "-92.16712,39.63615"
+          "id": "geoname/4150918",
+          "geo": "-81.86765,29.65132"
         },
-        "output": "L-Z Bravo Airport, Monroe County, United States"
+        "output": "Church Lake, Putnam County, United States"
       }
     },
     {
       "name": {
-        "default": "Z L Madden Elementary School"
+        "default": "Lake Citrus"
       },
       "admin0": "United States",
-      "admin1": "South Carolina",
-      "admin2": "Spartanburg County",
+      "admin1": "Florida",
+      "admin2": "Pinellas County",
       "center_point": {
-        "lat": "34.97207",
-        "lon": "-81.95149"
+        "lat": "27.99792",
+        "lon": "-82.75207"
       },
       "suggest": {
         "input": [
-          "z l madden elementary school"
+          "lake citrus"
         ],
         "payload": {
-          "id": "geoname/4601756",
-          "geo": "-81.95149,34.97207"
+          "id": "geoname/4151171",
+          "geo": "-82.75207,27.99792"
         },
-        "output": "Z L Madden Elementary School, Spartanburg County, United States"
+        "output": "Lake Citrus, Pinellas County, United States"
       }
     },
     {
       "name": {
-        "default": "H Z Smith Lake Dam"
+        "default": "Clear Lake"
       },
       "admin0": "United States",
-      "admin1": "Georgia",
-      "admin2": "Bulloch County",
+      "admin1": "Florida",
+      "admin2": "Lake County",
+      "center_point": {
+        "lat": "28.60427",
+        "lon": "-81.78748"
+      },
+      "suggest": {
+        "input": [
+          "clear lake"
+        ],
+        "payload": {
+          "id": "geoname/4151287",
+          "geo": "-81.78748,28.60427"
+        },
+        "output": "Clear Lake, Lake County, United States"
+      }
+    },
+    {
+      "name": {
+        "default": "Clear Lake"
+      },
+      "admin0": "United States",
+      "admin1": "Florida",
+      "admin2": "Putnam County",
+      "center_point": {
+        "lat": "29.62033",
+        "lon": "-81.96045"
+      },
+      "suggest": {
+        "input": [
+          "clear lake"
+        ],
+        "payload": {
+          "id": "geoname/4151296",
+          "geo": "-81.96045,29.62033"
+        },
+        "output": "Clear Lake, Putnam County, United States"
+      }
+    },
+    {
+      "name": {
+        "default": "Clearview Lake"
+      },
+      "admin0": "United States",
+      "admin1": "Florida",
+      "admin2": "Lake County",
+      "center_point": {
+        "lat": "28.93511",
+        "lon": "-81.88448"
+      },
+      "suggest": {
+        "input": [
+          "clearview lake"
+        ],
+        "payload": {
+          "id": "geoname/4151315",
+          "geo": "-81.88448,28.93511"
+        },
+        "output": "Clearview Lake, Lake County, United States"
+      }
+    },
+    {
+      "name": {
+        "default": "Clear Lake"
+      },
+      "admin0": "United States",
+      "admin1": "Florida",
+      "admin2": "Alachua County",
+      "center_point": {
+        "lat": "29.65102",
+        "lon": "-82.39114"
+      },
+      "suggest": {
+        "input": [
+          "clear lake"
+        ],
+        "payload": {
+          "id": "geoname/4151324",
+          "geo": "-82.39114,29.65102"
+        },
+        "output": "Clear Lake, Alachua County, United States"
+      }
+    },
+    {
+      "name": {
+        "default": "Clearwater Lake"
+      },
+      "admin0": "United States",
+      "admin1": "Florida",
+      "admin2": "Marion County",
+      "center_point": {
+        "lat": "29.07267",
+        "lon": "-82.504"
+      },
+      "suggest": {
+        "input": [
+          "clearwater lake"
+        ],
+        "payload": {
+          "id": "geoname/4151333",
+          "geo": "-82.504,29.07267"
+        },
+        "output": "Clearwater Lake, Marion County, United States"
+      }
+    },
+    {
+      "name": {
+        "default": "Lake Clifton"
+      },
+      "admin0": "United States",
+      "admin1": "Florida",
+      "admin2": "Volusia County",
       "center_point": {
-        "lat": "32.47684",
-        "lon": "-81.8315"
+        "lat": "29.1606",
+        "lon": "-81.34513"
       },
       "suggest": {
         "input": [
-          "h z smith lake dam"
+          "lake clifton"
         ],
         "payload": {
-          "id": "geoname/4198673",
-          "geo": "-81.8315,32.47684"
+          "id": "geoname/4151377",
+          "geo": "-81.34513,29.1606"
         },
-        "output": "H Z Smith Lake Dam, Bulloch County, United States"
+        "output": "Lake Clifton, Volusia County, United States"
       }
     },
     {
       "name": {
-        "default": "J Z George High School"
+        "default": "Lake Clough"
       },
       "admin0": "United States",
-      "admin1": "Mississippi",
-      "admin2": "Carroll County",
+      "admin1": "Florida",
+      "admin2": "Volusia County",
       "center_point": {
-        "lat": "33.52095",
-        "lon": "-89.92064"
+        "lat": "28.99362",
+        "lon": "-81.23336"
       },
       "suggest": {
         "input": [
-          "j z george high school"
+          "lake clough"
         ],
         "payload": {
-          "id": "geoname/4431378",
-          "geo": "-89.92064,33.52095"
+          "id": "geoname/4151386",
+          "geo": "-81.23336,28.99362"
         },
-        "output": "J Z George High School, Carroll County, United States"
+        "output": "Lake Clough, Volusia County, United States"
       }
     },
     {
       "name": {
-        "default": "Colonel Z Williams Landing (historical)"
+        "default": "Connell Lake"
       },
       "admin0": "United States",
-      "admin1": "Alabama",
-      "admin2": "Russell County",
+      "admin1": "Florida",
+      "admin2": "Citrus County",
       "center_point": {
-        "lat": "32.0646",
-        "lon": "-85.05604"
+        "lat": "28.86965",
+        "lon": "-82.3506"
       },
       "suggest": {
         "input": [
-          "colonel z williams landing (historical)"
+          "connell lake"
         ],
         "payload": {
-          "id": "geoname/4056398",
-          "geo": "-85.05604,32.0646"
+          "id": "geoname/4151719",
+          "geo": "-82.3506,28.86965"
         },
-        "output": "Colonel Z Williams Landing (historical), Russell County, United States"
+        "output": "Connell Lake, Citrus County, United States"
       }
     },
     {
       "name": {
-        "default": "Z M Jack Stell Field Airport",
-        "alt0": "CRT",
-        "alt1": "KCRT"
+        "default": "Cook Lake"
       },
       "admin0": "United States",
-      "admin1": "Arkansas",
-      "admin2": "Ashley County",
+      "admin1": "Florida",
+      "admin2": "Lake County",
+      "center_point": {
+        "lat": "28.83482",
+        "lon": "-81.78047"
+      },
+      "suggest": {
+        "input": [
+          "cook lake"
+        ],
+        "payload": {
+          "id": "geoname/4151764",
+          "geo": "-81.78047,28.83482"
+        },
+        "output": "Cook Lake, Lake County, United States"
+      }
+    },
+    {
+      "name": {
+        "default": "Cooper Lake"
+      },
+      "admin0": "United States",
+      "admin1": "Florida",
+      "admin2": "Putnam County",
+      "center_point": {
+        "lat": "29.62934",
+        "lon": "-81.94266"
+      },
+      "suggest": {
+        "input": [
+          "cooper lake"
+        ],
+        "payload": {
+          "id": "geoname/4151827",
+          "geo": "-81.94266,29.62934"
+        },
+        "output": "Cooper Lake, Putnam County, United States"
+      }
+    },
+    {
+      "name": {
+        "default": "Lake Corrine"
+      },
+      "admin0": "United States",
+      "admin1": "Florida",
+      "admin2": "Orange County",
+      "center_point": {
+        "lat": "28.57264",
+        "lon": "-81.32241"
+      },
+      "suggest": {
+        "input": [
+          "lake corrine"
+        ],
+        "payload": {
+          "id": "geoname/4152000",
+          "geo": "-81.32241,28.57264"
+        },
+        "output": "Lake Corrine, Orange County, United States"
+      }
+    },
+    {
+      "name": {
+        "default": "Cove Lake"
+      },
+      "admin0": "United States",
+      "admin1": "Florida",
+      "admin2": "Dixie County",
+      "center_point": {
+        "lat": "29.81069",
+        "lon": "-83.00354"
+      },
+      "suggest": {
+        "input": [
+          "cove lake"
+        ],
+        "payload": {
+          "id": "geoname/4152097",
+          "geo": "-83.00354,29.81069"
+        },
+        "output": "Cove Lake, Dixie County, United States"
+      }
+    },
+    {
+      "name": {
+        "default": "Crooked Lake"
+      },
+      "admin0": "United States",
+      "admin1": "Florida",
+      "admin2": "Orange County",
+      "center_point": {
+        "lat": "28.5929",
+        "lon": "-81.48204"
+      },
+      "suggest": {
+        "input": [
+          "crooked lake"
+        ],
+        "payload": {
+          "id": "geoname/4152358",
+          "geo": "-81.48204,28.5929"
+        },
+        "output": "Crooked Lake, Orange County, United States"
+      }
+    },
+    {
+      "name": {
+        "default": "Lake Crosby"
+      },
+      "admin0": "United States",
+      "admin1": "Florida",
+      "admin2": "Bradford County",
+      "center_point": {
+        "lat": "29.94273",
+        "lon": "-82.15715"
+      },
+      "suggest": {
+        "input": [
+          "lake crosby"
+        ],
+        "payload": {
+          "id": "geoname/4152376",
+          "geo": "-82.15715,29.94273"
+        },
+        "output": "Lake Crosby, Bradford County, United States"
+      }
+    },
+    {
+      "name": {
+        "default": "Lake Crowell"
+      },
+      "admin0": "United States",
+      "admin1": "Florida",
+      "admin2": "Orange County",
+      "center_point": {
+        "lat": "28.41965",
+        "lon": "-81.49589"
+      },
+      "suggest": {
+        "input": [
+          "lake crowell"
+        ],
+        "payload": {
+          "id": "geoname/4152440",
+          "geo": "-81.49589,28.41965"
+        },
+        "output": "Lake Crowell, Orange County, United States"
+      }
+    },
+    {
+      "name": {
+        "default": "Crystal Lake"
+      },
+      "admin0": "United States",
+      "admin1": "Florida",
+      "admin2": "Polk County",
+      "center_point": {
+        "lat": "27.86861",
+        "lon": "-81.71079"
+      },
+      "suggest": {
+        "input": [
+          "crystal lake"
+        ],
+        "payload": {
+          "id": "geoname/4152466",
+          "geo": "-81.71079,27.86861"
+        },
+        "output": "Crystal Lake, Polk County, United States"
+      }
+    },
+    {
+      "name": {
+        "default": "Crystal Lake"
+      },
+      "admin0": "United States",
+      "admin1": "Florida",
+      "admin2": "Seminole County",
+      "center_point": {
+        "lat": "28.77055",
+        "lon": "-81.31479"
+      },
+      "suggest": {
+        "input": [
+          "crystal lake"
+        ],
+        "payload": {
+          "id": "geoname/4152475",
+          "geo": "-81.31479,28.77055"
+        },
+        "output": "Crystal Lake, Seminole County, United States"
+      }
+    },
+    {
+      "name": {
+        "default": "Cypress Lake"
+      },
+      "admin0": "United States",
+      "admin1": "Florida",
+      "admin2": "Lake County",
+      "center_point": {
+        "lat": "28.43075",
+        "lon": "-81.76247"
+      },
+      "suggest": {
+        "input": [
+          "cypress lake"
+        ],
+        "payload": {
+          "id": "geoname/4152637",
+          "geo": "-81.76247,28.43075"
+        },
+        "output": "Cypress Lake, Lake County, United States"
+      }
+    },
+    {
+      "name": {
+        "default": "Deer Lake"
+      },
+      "admin0": "United States",
+      "admin1": "Florida",
+      "admin2": "Marion County",
+      "center_point": {
+        "lat": "29.20003",
+        "lon": "-81.83805"
+      },
+      "suggest": {
+        "input": [
+          "deer lake"
+        ],
+        "payload": {
+          "id": "geoname/4153052",
+          "geo": "-81.83805,29.20003"
+        },
+        "output": "Deer Lake, Marion County, United States"
+      }
+    },
+    {
+      "name": {
+        "default": "Lake Deer"
+      },
+      "admin0": "United States",
+      "admin1": "Florida",
+      "admin2": "Polk County",
+      "center_point": {
+        "lat": "28.02571",
+        "lon": "-81.76317"
+      },
+      "suggest": {
+        "input": [
+          "lake deer"
+        ],
+        "payload": {
+          "id": "geoname/4153070",
+          "geo": "-81.76317,28.02571"
+        },
+        "output": "Lake Deer, Polk County, United States"
+      }
+    },
+    {
+      "name": {
+        "default": "Dempsey Lake"
+      },
+      "admin0": "United States",
+      "admin1": "Florida",
+      "admin2": "Suwannee County",
       "center_point": {
-        "lat": "33.17269",
-        "lon": "-91.88504"
+        "lat": "30.37031",
+        "lon": "-83.18977"
       },
       "suggest": {
         "input": [
-          "z m jack stell field airport",
-          "crt",
-          "kcrt"
+          "dempsey lake"
         ],
         "payload": {
-          "id": "geoname/4107205",
-          "geo": "-91.88504,33.17269"
+          "id": "geoname/4153160",
+          "geo": "-83.18977,30.37031"
         },
-        "output": "Z M Jack Stell Field Airport, Ashley County, United States"
+        "output": "Dempsey Lake, Suwannee County, United States"
       }
     }
   ]
diff --git a/test/ciao/search/success.coffee b/test/ciao/search/success.coffee
index 34249e00..b55899cd 100644
--- a/test/ciao/search/success.coffee
+++ b/test/ciao/search/success.coffee
@@ -1,5 +1,5 @@
 #> valid search query
-path: '/search?input=z&lat=0&lon=0'
+path: '/search?input=lake&lat=29.49136&lon=-82.50622'
 
 #? 200 ok
 response.statusCode.should.equal 200