Fixed issue with filtering