Fix multiple select upon save