added location autocomplete
fixed merge conflicts