Fixed tags, locations and added filters