Update pagination, improve geocoding