Fix error on geocoding queries
Merge branch 'CDB-1699' of github.com:CartoDB/cartodb into CDB-1699