bugfixing, new filter concept