select2 & minor fixes
merge