BC-440 Better CategorySelect2