consolidate locations to a single positon, fixes for geloocation and overlay issues