filter working as ||; needs to be fixed to && instead