+ [OE-5174] updates to checking for secondary options