Update OU Qtype pmatch for simplified forms #6675