Converting from chosen to select2 and various bugfixes