select2 various fixes