added better Select 2 support