trying to fix filtering