Revert broken change to MultiSelect Widget, DRMP layout tweak