Removed 'not' filtering