diff --git a/AUTHORS b/AUTHORS
index 061fe67cc..3865bd6b0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,3 +21,4 @@ Authors of OpenSlides in chronological order of first contribution:
     Erik Steenman <eriksteenman@gmail.com>
     Sean Engelhardt <sean.f.t.engelhardt@gmail.com>
     Maximilian Krambach <maximilian.krambach@gmx.de>
+    Joel Macht <joel.macht@web.de>
diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css
index 96ca067aa..06fc108ad 100644
--- a/openslides/core/static/css/app.css
+++ b/openslides/core/static/css/app.css
@@ -714,6 +714,14 @@ img {
     margin-bottom: 0;
 }
 
+
+/* override booststrap's label class to fix linebreak and add spacing */
+.label {
+    display: inline-block;
+    padding: .3em .6em;
+    margin-right: .2em;
+}
+
 /* for angular-csv-import form */
 .import {
     margin-left: 15px;
diff --git a/openslides/motions/static/templates/motions/motion-list.html b/openslides/motions/static/templates/motions/motion-list.html
index 2427ff46b..8399ac0e7 100644
--- a/openslides/motions/static/templates/motions/motion-list.html
+++ b/openslides/motions/static/templates/motions/motion-list.html
@@ -163,7 +163,7 @@
         <td ng-if="!motion.quickEdit" ng-mouseover="motion.hover=true" ng-mouseleave="motion.hover=false">
             <strong><a ui-sref="motions.motion.detail({id: motion.id})">{{ motion.getTitle() }}</a></strong>
             <span ng-repeat="tag in motion.tags" class="label label-default">
-              {{ tag.name }}{{$last ? '' : ', '}}
+              {{ tag.name }}
             </span>
             <div ng-if="motion.isAllowed('update')" class="hoverActions" ng-class="{'hiddenDiv': !motion.hover}">
               <span ng-if="motion.isAllowed('update')">