Fixes: #2313 Cleaning categories and objectTypes
Fixes: #2313 Using objectType filter in listing