Radical refactoring. City filter implemented.