diff --git a/server.go b/server.go
index 7e8098a..74a2ccf 100644
--- a/server.go
+++ b/server.go
@@ -44,8 +44,7 @@ func executeQuery(rw http.ResponseWriter, req *http.Request) {
 
 	var geo *geoContext
 	if request.Geo != nil {
-		geo.latitude = request.Geo.Latitude
-		geo.longitude = request.Geo.Longitude
+		geo = &geoContext{latitude: request.Geo.Latitude, longitude: request.Geo.Longitude}
 	}
 
 	context := queryContext{geo, request.Profile, request.WalkingDist}
diff --git a/util.go b/util.go
index 1e2c39a..fbbac36 100644
--- a/util.go
+++ b/util.go
@@ -219,6 +219,7 @@ func getRecords(context queryContext) records {
 			accessCount:   accessCount,
 			id:            id}
 
+		entry.features = make(featureMap)
 		entry.features["delicious"] = delicious
 		entry.features["accomodating"] = accomodating
 		entry.features["affordable"] = affordable