Fix filtering by strategy