Geocoder kept, Index optimized
Finalized merging with suresh