Add option to disable filtering