Change isMandatory to isSelectionOptional to sync it with back end model