Minor changes

- Swap categories
- Catch exception on wrong format categories filter