diff --git a/openslides/account/templates/account/personal_info_widget.html b/openslides/account/templates/account/personal_info_widget.html
index 482a265ac..d1e0d0ff3 100644
--- a/openslides/account/templates/account/personal_info_widget.html
+++ b/openslides/account/templates/account/personal_info_widget.html
@@ -16,11 +16,7 @@
     {% for motion in submitted_motions %}
         <li>
             <a href="{% model_url motion %}">
-                {% if motion.identifier %}
-                    [# {{ motion.identifier }}]
-                {% else %}
-                    [---]
-                {% endif %}
+                {{ motion.identifier|add:' | '|default:'' }}
                 {{ motion }}
             </a>
         </li>
diff --git a/openslides/motion/templates/motion/motion_detail.html b/openslides/motion/templates/motion/motion_detail.html
index f849e6cec..affa58954 100644
--- a/openslides/motion/templates/motion/motion_detail.html
+++ b/openslides/motion/templates/motion/motion_detail.html
@@ -16,14 +16,10 @@
 <h1>
     {{ title }}
     <br>
-    <small>
-    {% if motion.identifier %}
-        {% trans "Motion" %} {{ motion.identifier|default:'' }},
-    {% else %}
-        <i>[{% trans "no number" %}]</i>,
+    <small>{% trans "Motion" %} {{ motion.identifier|default:'' }}
+    {% if motion.versions.count > 1 %}
+        | {% trans "Version" %} {{ version.version_number }}
     {% endif %}
-    {# TODO: show only for workflow with versioning #}
-    {% trans "Version" %} {{ version.version_number }}
     </small>
     <small class="pull-right">
         <a href="{% url 'motion_list' %}" class="btn btn-mini"
@@ -242,15 +238,13 @@
 
         <!-- Creation Time -->
         <h5>
-            {% with versions=motion.versions.all %}
-            {% if versions|length > 1 %}
+            {% if motion.versions.count > 1 %}
                 {% trans "Last changes (of this version)" %}:
             {% else %}
                 {% trans "Last changes" %}:
             {% endif %}
-            {% endwith %}
         </h5>
-        {{ motion.use_version.creation_time }}
+        {{ version.creation_time }}
 
         <!-- Widthdraw button -->
         {# TODO: Check this button #}
diff --git a/openslides/motion/templates/motion/motion_list.html b/openslides/motion/templates/motion/motion_list.html
index 3f6c478e1..6cff3ed99 100644
--- a/openslides/motion/templates/motion/motion_list.html
+++ b/openslides/motion/templates/motion/motion_list.html
@@ -70,7 +70,7 @@
                     </td>
                 {% endwith %}
             {% endif %}
-            <td class="optional">{{ motion.last_version.creation_time }}</td>
+            <td class="optional">{{ motion.get_last_version.creation_time }}</td>
             <td>
                 <span style="width: 1px; white-space: nowrap;">
                 {% if perms.projector.can_manage_projector %}
diff --git a/openslides/motion/templates/motion/widget.html b/openslides/motion/templates/motion/widget.html
index 2a9e47bdb..b26ca3e97 100644
--- a/openslides/motion/templates/motion/widget.html
+++ b/openslides/motion/templates/motion/widget.html
@@ -14,11 +14,7 @@
             <i class="icon-search"></i>
         </a>
         <a href="{% model_url motion %}">
-            {% if motion.identifier %}
-                [# {{ motion.identifier }}]
-            {% else %}
-                [---]
-            {% endif %}
+            {{ motion.identifier|add:' | '|default:'' }}
             {{ motion }}
         </a>
     </li>