Improved filters

Jochem de Goede requested to merge improved-filters into queue-sprint