Previous implementation looped backward from last token,
but just a match seems to be required in order to insert
the associated ComboBox position in a std::set (which does
not care for insertion order).

Change-Id: If92b28a9364e59fca46e728164be41e0755d0977