diff --git a/src/tools/common/template_xmlui.py b/src/tools/common/template_xmlui.py
index c078bdf2..cd140766 100644
--- a/src/tools/common/template_xmlui.py
+++ b/src/tools/common/template_xmlui.py
@@ -53,6 +53,13 @@ class ValueWidget(Widget):
     def values(self):
         return [self.value]
 
+    @property
+    def labels(self):
+        # helper property, there is not label for ValueWidget
+        # but using labels make rendering more easy (one single method to call)
+        # values are actually returned
+        return [self.value]
+
 
 class InputWidget(ValueWidget):
 
@@ -71,7 +78,8 @@ class OptionsWidget(Widget):
 
     @property
     def values(self):
-        return self.selected
+        for value, label in self.items:
+            yield value
 
     @property
     def labels(self):