Changed numbers used to determine sort order to match room layout
Corrected logic so that 9 once again comes before 10 with newly altered layout
Fix for CHOICE.COM syntax