before filter fixes