Changed back to only on before filter, seems safer security-wise