ROO-609: Swapping order of security filter