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

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