More fixes to select2 interface