diff --git a/TODO b/TODO
index 8b13789..f3410d1 100644
--- a/TODO
+++ b/TODO
@@ -1 +1 @@
-
+- remove None and [] in the overwiew in last step and in mails
diff --git a/evapp/views.py b/evapp/views.py
index e606561..4f687b6 100644
--- a/evapp/views.py
+++ b/evapp/views.py
@@ -176,6 +176,7 @@ class EvaFormView(LoginRequiredMixin, CookieWizardView):
             data['accounts'] = [ACCOUNT_CHOICES[c] for c in data['accounts']]
 
         # replace keys in data dictionary with verbose_name
+        # a bit ugly workaround here: we need to store 'email' away, because it es not in the modell
         mail = ''
         if 'email' in data:
             mail = data.pop('email')
@@ -183,8 +184,11 @@ class EvaFormView(LoginRequiredMixin, CookieWizardView):
         if mail:
             newdata['Email'] = mail
 
-        #translate booleans
+        # translate booleans
         newdata.update({k:'Ja' for k,v in newdata.items() if isinstance(v,bool) and v == True})
         newdata.update({k:'Nein' for k,v in newdata.items() if isinstance(v,bool) and v == False})
+        # handle some special data types
+        newdata.update({k:'' for k,v in newdata.items() if v == None})
+        newdata.update({k:'' for k,v in newdata.items() if v == []})
 
         return newdata