Location select refactoring