Select2 + fix datasets
Merge remote-tracking branch 'origin/master'