Fixed mistakes from merge and explicitly turn multiselect off and on based on flag