Added tag filters to some of the entities.