Refactor city filter

City filter is now working as intended a test to back it up.