Two additional fixes to fix display in the catalog of a product with nested options and option groups.