Fix for the location restriction
Code refactoring
Merge pull request #3824 from lwyszomi/121592

Fix for the location filter restriction