diff --git a/src/pg/sql/60_observatory_providers.sql b/src/pg/sql/60_observatory_providers.sql
index ed9f55e..eb2754c 100644
--- a/src/pg/sql/60_observatory_providers.sql
+++ b/src/pg/sql/60_observatory_providers.sql
@@ -22,6 +22,7 @@ CREATE OR REPLACE FUNCTION cdb_observatory._OBS_GetOverpass(
 
 $$ LANGUAGE plpythonu;
 
+
 CREATE OR REPLACE FUNCTION cdb_observatory.OBS_GetOverpass(
   query text
 ) RETURNS TABLE (
@@ -42,3 +43,62 @@ BEGIN
   RETURN;
 END;
 $$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION cdb_observatory.OBS_GetOverpassPOI(
+  within_geom Geometry(Geometry, 4326),
+  filters TEXT[] DEFAULT ARRAY[ 'pub', 'bar', 'restaurant', 'fast_food',
+  'cafe', 'food_court', 'ice_cream', 'college', 'kindergarten', 'library',
+  'school', 'music_school', 'driving_school', 'language_school', 'university',
+  'bicycle_rental', 'boat_sharing', 'car_rental', 'car_sharing', 'car_wash',
+  'ferry_terminal', 'fuel', 'bank', 'bureau_de_change', 'clinic', 'dentist',
+  'doctors', 'hospital', 'nursing_home', 'pharmacy', 'social_facility',
+  'veterinary', 'blood_donation', 'arts_centre', 'brothel', 'casino',
+  'community_centre', 'cinema', 'gambling', 'nightclub', 'planetarium',
+  'social_centre', 'stripclub', 'swingerclub', 'studio', 'theatre',
+  'animal_boarding', 'animal_shelter', 'courthouse', 'coworking_space',
+  'crematorium', 'dive_centre', 'dojo', 'embassy', 'fire_station',
+  'internet_cafe', 'marketplace', 'place_of_worship', 'police', 'post_office',
+  'prison', 'townhall', 'waste_transfer_station'
+  ],
+  name TEXT DEFAULT NULL
+) RETURNS TABLE (
+  geom Geometry(Geometry, 4326),
+  "type" TEXT,
+  id TEXT,
+  properties JSON
+) AS $$
+DECLARE
+  osm_bbox TEXT;
+  query TEXT;
+BEGIN
+  osm_bbox := replace(replace(replace(regexp_replace(box2d(within_geom)::TEXT,
+          E'(\\-?\\d+\\.?\\d+) (\\-?\\d+\\.?\\d+)',
+          E'\\2 \\1', 'g'),
+        ' ', ','),
+      'BOX(', ''),
+    ')', '');
+
+  EXECUTE $string$
+    WITH filters AS (SELECT UNNEST($1) as filter)
+    SELECT ' ( '
+     'node ["name"]["amenity"~"' || String_Agg(filter, '|') || '"] (' || $2 || '); ' ||
+     'way  ["name"]["amenity"~"' || String_Agg(filter, '|') || '"] (' || $2 || ')) '
+    FROM filters
+  $string$
+  INTO query
+  USING filters, osm_bbox, name;
+
+  RAISE NOTICE '%', query;
+  RETURN QUERY
+  EXECUTE $string$
+    WITH results AS (SELECT ST_SetSRID(ST_GeomFromGeojson(geom), 4326) geom,
+           "type",
+           id,
+           properties::JSON
+    FROM cdb_observatory._OBS_GetOverPass($1))
+    SELECT * FROM results WHERE ST_Within(geom, $2)
+  $string$ USING query, within_geom
+  RETURN;
+END;
+$$ LANGUAGE plpgsql;
diff --git a/src/python/observatory/observatory/osm.py b/src/python/observatory/observatory/osm.py
index 091861e..e5ea70c 100644
--- a/src/python/observatory/observatory/osm.py
+++ b/src/python/observatory/observatory/osm.py
@@ -6,32 +6,6 @@ def get_overpass(query):
     '''
     Return results of a raw overpass query.
     '''
-
-    '''
-(node
-  [amenity]
-  (around:400,
-40.704301, -73.936658);
-way
-  [amenity]
-  (around:400,
-40.704301, -73.936658))
-    '''
-
-    '''
-(node [amenity] (around:400, 40.704301, -73.936658); way [amenity] (around:400, 40.704301, -73.936658))
-    '''
-
     api = API()
     response = api.Get(query)
-
     return response['features']
-    #return [(el['lat'], el['lon'], el['type'], el['id'], json.dumps(el['tags']) )
-    #        for el in response['elements'] if 'lat' in el][0]
-
-
-def get_overpass_poi(within_geom, geom, filters=None, name=None):
-    '''
-    Simplified access to overpass API
-    '''
-    pass