Feature/570 filters for entity type

Implements issue #570