bugfix with filtering