diff --git a/knowledge/survey/browser.py b/knowledge/survey/browser.py
index b4d9f06..04a46d1 100644
--- a/knowledge/survey/browser.py
+++ b/knowledge/survey/browser.py
@@ -204,13 +204,9 @@ class SurveyView(ConceptView):
         result = []
         for opt in self.answerOptions:
             value = str(opt['value'])
-            result.append(dict(value=value, checked=(setting == value)))
+            result.append(dict(value=value, checked=(setting == value), 
+                                title=opt['description']))
         return result
-      
-        #noAnswer = [dict(value='none', checked=(setting == None),
-        #                 radio=(not question.required))]
-        #return noAnswer + [dict(value=i, checked=(setting == i), radio=True) 
-        #                        for i in reversed(range(question.answerRange))]
 
 
 class SurveyCsvExport(NodeView):
diff --git a/knowledge/survey/view_macros.pt b/knowledge/survey/view_macros.pt
index 91be3c1..8f5ec42 100644
--- a/knowledge/survey/view_macros.pt
+++ b/knowledge/survey/view_macros.pt
@@ -87,7 +87,7 @@
                             name string:question_${question/uid};
                             value value/value;
                             checked value/checked;
-                            title string:survey_value_${value/value}" />
+                            title value/title" />
             </td>
           </tr>
         </tal:qugroup>