Fix filtering by puzzle