fix for select2, minor fixes