fixed issue with zooming to location, refactored approach slightly [Delivers #74724768]