add position locator fix and refactored code to run after coordinates fetch