refactored the filter
refactored the city filter directive