More refactoring, a residue of attempts to do select2 integration, so far unsuccessful. #10