fixed broken filtering