changed conflicting field name

1. changed conflicting field name
2. Added suport for geocoding