Fixes to TbSelect2