Minor bugfixes

Some minor fixes were introduced (regarding e.g. the categorization of toolbox resources). In addition, the upload functionality has been improved.