Minor fixes to the category selector.
Merge pull request #1390 from cmfcmf/category-selector

Minor fixes to the category selector.