Fixed issues with duplicated locations on fallback and other isuses