Authentication before filter
Fix merge conflicts