Fix multi-select, fix broken test cases.