Fix multi-select for handlebar changes