Adding filters for entities