Tweaks to Spring filters based on security upgrade