#31 Fixes for SetupVerifyFilter