Add indexes to numeric street location fields and remove from street string location fields.#2692