Location Filtering attempt 2

Last pull request didn't show up-to-date code