OSM query improvements