city filter now fully included