Fixed a bug to do with combo box, cleaned up a bit

It messed up when item was removed due to order; found hardcoded tests
of indices that created an obscure bug with the wrong types of
categories being displayed.