Make sure both characteristics & accommodations show correctly on Options page [Fixes #80484626]