Updated schema and POI queries