Should now work with Select2 as well