diff --git a/pagure/templates/roadmap.html b/pagure/templates/roadmap.html
index 0825134..4990cbf 100644
--- a/pagure/templates/roadmap.html
+++ b/pagure/templates/roadmap.html
@@ -151,10 +151,14 @@
 {% for milestone in milestones %}
 <div class="card m-t-1">
   <div class="card-block">
-    <table id="pagure-issues-list" class="table table-hover table-striped m-b-0">
+    <table id="pagure-issues-list-{{milestone}}" class="table table-hover table-striped m-b-0">
       <thead class="thead-default">
         <tr>
-          <th id="issue-title">Milestone: {{ milestone }}</th>
+          <th id="issue-title">Milestone: {{ milestone }}
+            {% if repo.milestones[milestone] %}
+              <span style="font-weight:normal">&nbsp (Due: {{ repo.milestones[milestone] }})</span>
+            {% endif %}
+          </th>
           <th class="open_date">Opened</th>
           {% if status and status|lower != 'open' %}
             <th class="close_date">Closed</th>
@@ -179,11 +183,6 @@
               status=status) }}">reset</a>)
             </th>
           {% endif %}
-          {% if repo.milestones[milestone] %}
-            <span class="pull-xs-right">
-            Due: {{ repo.milestones[milestone] }}
-            </span>
-          {% endif %}
           <th class="issue_status">Status</th>
         </tr>
       </thead>
@@ -194,15 +193,6 @@
           <tr {% if issue.status != 'Open' %}class="text-muted"{% endif %}>
             <td>
               <span class="label label-default">#{{ issue.id }}</span>
-              {% if status is none or status != 'Open' %}
-              <span class="label {% if
-                issue.close_status|lower == 'invalid' %}label-danger{%
-                elif issue.close_status|lower == 'fixed' %}label-success{%
-                elif issue.close_status|lower == 'insufficient data' %}label-warning{%
-                elif issue.close_status|lower == 'duplicate' %}label-default{%
-                elif issue.close_status %}label-default{%
-                endif %}">{{issue.close_status}}</span>
-              {% endif %}
               {% if issue.private %}
               <span class="oi red-icon" data-glyph="lock-locked" title="Private issue"></span>
               {% endif %}
diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py
index e192a7e..ca1067b 100644
--- a/pagure/ui/issues.py
+++ b/pagure/ui/issues.py
@@ -249,7 +249,7 @@ def update_issue(repo, issueid, username=None, namespace=None):
                     ticketfolder=APP.config['TICKETS_FOLDER'],
                 )
                 SESSION.commit()
-                if message and message != 'Nothing to change':
+                if message:
                     messages.add(message)
 
                 # Update priority
@@ -705,13 +705,12 @@ def view_roadmap(repo, username=None, namespace=None):
     requested_stones = None
     if milestone is not None:
         requested_stones = milestone
-    milestones = milestone or list(repo.milestones.keys())
     all_milestones = list(repo.milestones.keys())
 
     issues = pagure.lib.search_issues(
         SESSION,
         repo,
-        milestones=milestones,
+        milestones=milestone or list(repo.milestones.keys()),
         tags=tags,
         private=private,
     )
@@ -720,7 +719,7 @@ def view_roadmap(repo, username=None, namespace=None):
     milestone_issues = defaultdict(list)
     for cnt in range(len(issues)):
         saved = False
-        for mlstone in sorted(milestones):
+        for mlstone in sorted(milestone or list(repo.milestones.keys())):
             if mlstone == issues[cnt].milestone:
                 milestone_issues[mlstone].append(issues[cnt])
                 saved = True
diff --git a/tests/test_pagure_flask_ui_roadmap.py b/tests/test_pagure_flask_ui_roadmap.py
index c01da82..8053e8a 100644
--- a/tests/test_pagure_flask_ui_roadmap.py
+++ b/tests/test_pagure_flask_ui_roadmap.py
@@ -162,7 +162,6 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
                 'href="/test/issue/1/edit" title="Edit this issue">',
                 output.data)
 
-
     def test_update_milestones(self):
         """ Test updating milestones of a repo. """
         tests.create_projects(self.session)
@@ -482,7 +481,6 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
         # test the roadmap view
         output = self.app.get('/test/roadmap')
         self.assertEqual(output.status_code, 200)
-        self.assertIn(u'2 Milestones', output.data)
         self.assertIn(u'Milestone: v2.0', output.data)
         self.assertIn(u'Milestone: unplanned', output.data)
         self.assertEqual(
@@ -491,7 +489,6 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
         # test the roadmap view for all milestones
         output = self.app.get('/test/roadmap?status=All')
         self.assertEqual(output.status_code, 200)
-        self.assertIn(u'3 Milestones', output.data)
         self.assertIn(u'Milestone: v1.0', output.data)
         self.assertIn(u'Milestone: v2.0', output.data)
         self.assertIn(u'Milestone: unplanned', output.data)
@@ -501,27 +498,31 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
         # test the roadmap view for a specific milestone
         output = self.app.get('/test/roadmap?milestone=v2.0')
         self.assertEqual(output.status_code, 200)
-        self.assertIn(u'1 Milestones', output.data)
         self.assertIn(u'Milestone: v2.0', output.data)
         self.assertEqual(
             output.data.count(u'<span class="label label-default">#'), 2)
 
-        # test the roadmap view for a specific milestone - closed
+        # test the roadmap view for a specific milestone - open
         output = self.app.get('/test/roadmap?milestone=v1.0')
         self.assertEqual(output.status_code, 200)
-        self.assertIn(u'1 Milestones', output.data)
-        self.assertIn(u'Milestone: v1.0', output.data)
+        self.assertIn(u'No issues found', output.data)
         self.assertEqual(
             output.data.count(u'<span class="label label-default">#'), 0)
 
         # test the roadmap view for a specific milestone - closed
         output = self.app.get('/test/roadmap?milestone=v1.0&status=All')
         self.assertEqual(output.status_code, 200)
-        self.assertIn(u'1 Milestones', output.data)
         self.assertIn(u'Milestone: v1.0', output.data)
         self.assertEqual(
             output.data.count(u'<span class="label label-default">#'), 2)
 
+        # test the roadmap view for a specific tag
+        output = self.app.get('/test/roadmap?milestone=v2.0&tag=unknown')
+        self.assertEqual(output.status_code, 200)
+        self.assertIn(u'No issues found', output.data)
+        self.assertEqual(
+            output.data.count(u'<span class="label label-default">#'), 0)
+
         # test the roadmap view for errors
         output = self.app.get('/foo/roadmap')
         self.assertEqual(output.status_code, 404)