Update OU Qtype gapselect for simplified forms #6609