--- a/globalneighbors/web.py	Sun Jun 25 14:29:18 2017 -0700
+++ b/globalneighbors/web.py	Sun Jun 25 14:55:53 2017 -0700
@@ -58,12 +58,19 @@
         for i in cities:
             if i[name].startswith(startswith):
                 retval.append({"name": i[name],
+                               "country code": i["country code"],
+                               "population": i['population'],
                                "geonameid": i['geonameid']})
     else:
         retval = [{"name": i[name],
-                  "geonameid": i['geonameid']}
+                   "country code": i["country code"],
+                   "population": i['population'],
+                   "geonameid": i['geonameid']}
                    for i in cities]
-    return sorted(retval, key=lambda x: x['name'])[:limit]
+    return sorted(retval,
+                  key=lambda x: (x['name'],
+                                 -x['population'])
+                  )[:limit]
 
 
 class Handler(object):
@@ -152,8 +159,9 @@
                 city = self.cities.get(geoid)
                 if not city:
                     return
+                variables = dict(city=city)
                 return Response(content_type=self.content_type,
-                                body=self.citypage.render(**city))
+                                body=self.citypage.render(variables))
             except ValueError:
                 pass