Fixed to ensure "no filter" works