fixed issue with filtering