Rework on filters to have a better managment of authentication