diff --git a/packages/tc-ui/src/primitives/multiple-choice/server.jsx b/packages/tc-ui/src/primitives/multiple-choice/server.jsx
index 192189189..0ef9adae6 100644
--- a/packages/tc-ui/src/primitives/multiple-choice/server.jsx
+++ b/packages/tc-ui/src/primitives/multiple-choice/server.jsx
@@ -95,7 +95,7 @@ const EditMultipleChoice = props => {
 	} = props;
 	const name = !isNested ? propertyName : '';
 	const options = Object.keys(getEnums()[type]);
-	const value = props.value ? props.value.sort() : [];
+	const value = props.value || [];
 	return (
 		<span className="o-forms-input o-forms-input--checkbox o-forms-input--inline">
 			{options.map((option, index) => (
diff --git a/packages/tc-ui/src/primitives/simple-relationship/server.jsx b/packages/tc-ui/src/primitives/simple-relationship/server.jsx
index b83175a9c..1988058ee 100644
--- a/packages/tc-ui/src/primitives/simple-relationship/server.jsx
+++ b/packages/tc-ui/src/primitives/simple-relationship/server.jsx
@@ -5,6 +5,7 @@ const { RelationshipPicker } = require('../relationship-picker');
 const { SelectedRelationship } = require('./lib/selected-relationship');
 
 const RelationshipPickerContainer = props => (
+	// Note the extra div is there to playa role in flexbox-based styling
 	<div>
 		<RelationshipPicker
 			{...props}