HV-731 et. al.: Several fixes around validationAppliesTo()