Fix typo

The logical check was used to check category against type, this fixes it
Fixes the list of categories

Semi complete list was used for the category choosing, now using the full list