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