Data indexing improvements

This PR batches some perf improvements about OSM data indexing.