Updated to use CartoDB OSM data table