Added scanner filter support