Changed location filter
code refactoring