fixed issue with filters after performance optimisations