MODIFY: Added filtering select for location
Merge branch 'master' of https://github.com/techboy-/ncc