Changes to the Filter in preparation for auth key mechanism gui issue 4