diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index f809d316d3..c437c2b51d 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -83,6 +83,8 @@ services:
       args:
         - ENVIRONMENT=development
     image: lfmerge
+    # Elevated privileges needed for debugging (tested in WSL) -- don't use in production
+    privileged: true
     container_name: lfmerge
     platform: linux/amd64
     depends_on:
diff --git a/src/Api/Model/Languageforge/Lexicon/LexOptionListItem.php b/src/Api/Model/Languageforge/Lexicon/LexOptionListItem.php
index c645844485..ab661bed11 100644
--- a/src/Api/Model/Languageforge/Lexicon/LexOptionListItem.php
+++ b/src/Api/Model/Languageforge/Lexicon/LexOptionListItem.php
@@ -21,7 +21,7 @@ public function __construct($value = '', $key = null, $guid = '')
         if ($guid) $this->guid = $guid;
         $this->value = $value;
         if (is_null($key)) {
-            $this->key = $value;
+            $this->key = $guid;
         } else {
             $this->key = $key;
         }
diff --git a/src/angular-app/languageforge/lexicon/editor/field/dc-optionlist.component.html b/src/angular-app/languageforge/lexicon/editor/field/dc-optionlist.component.html
index df0a7787b8..53b80fbb30 100644
--- a/src/angular-app/languageforge/lexicon/editor/field/dc-optionlist.component.html
+++ b/src/angular-app/languageforge/lexicon/editor/field/dc-optionlist.component.html
@@ -8,7 +8,7 @@
                 <option value="">Unknown</option>
             </select>
             <span class="uneditable-input" data-ng-hide="$ctrl.isAtEditorEntry() && $ctrl.control.rights.canEditEntry()"
-                  data-ng-bind="$ctrl.getDisplayName($ctrl.model.value)"></span>
+                  data-ng-bind="$ctrl.getDisplayName($ctrl.model.key)"></span>
         </div>
         <comment-bubble control="$ctrl.control" field="$ctrl.fieldName" input-system="" model="$ctrl.model" parent-context-guid="$ctrl.contextGuid"></comment-bubble>
     </div>