Simplify the building of the OSM query by reducing the number of temp st...

...rings.