better support for filters and fixing of handling bug