         attribution: '(c) Esri'
       )
 
-      regionMouseOver = (e) ->
-        r = getRegItem(e.target.feature)
-
-        if r
-          hoverText = r.region + ": " + r[$scope.choroChoice].toPrecision(3) + "%"
+      mouseOver = (e) ->
+        [type,item] = getItem(e.target.feature)
+
+        if item
+          hoverText = item[type] + ": " + item[$scope.choroChoice].toPrecision(3) + "%"
         else
           hoverText = ""
 

      map = L.map('nationalDashMap',
        center: new L.LatLng(-6.3153, 35.15625),
        zoom: 5,
        layers: [osmLayer, regLayer, clusterLayer]
      )

      baseMaps =


      overlayMaps =
        "Regions": regLayer
        "Wards": wardLayer
        #"Waterpoints": clusterLayer

      # add a layer selector
