[OE-5248] + [OE-5247] Fix multiselect related bugs