Select2 fixes