[OE-5248] Additional fix for multiselect