conditions added to filter (correction)