added filtering of city and null