Commenting and fix bad conditional
Make redirection filterable