diff --git a/pagure/templates/roadmap.html b/pagure/templates/roadmap.html
index 60f3837..8ca9cee 100644
--- a/pagure/templates/roadmap.html
+++ b/pagure/templates/roadmap.html
@@ -47,21 +47,17 @@
   <span class="btn-group btn-group-sm issues-tagbar" role="group">
     {% for tag in tag_list %}
       {% if tag.tag in tags %}
-        {% if status and status != 'Open' %}
         <a class="btn btn-secondary btn-sm {% if tag.tag in tags%}active{% endif %}"
             href="{{ url_for('view_roadmap', username=username,
-                             repo=repo.name, status='All') }}"
-                   title="Filter issues by tag">
-         {% else %}
-        <a class="btn btn-secondary btn-sm {% if tag.tag in tags%}active{% endif %}"
-            href="{{ url_for('view_roadmap', username=username, repo=repo.name) }}"
-                   title="Filter issues by tag">
-         {% endif %}
+                             repo=repo.name, milestone=tag.tag,
+                             status='All' if not status else None) }}"
+                   title="Filter issues by milestone">
       {% else %}
         <a class="btn btn-secondary btn-sm {% if tag.tag in tags%}active{%endif%}"
             href="{{ url_for('view_roadmap', username=username,
-                   repo=repo.name, tags=tag.tag) }}"
-                   title="Filter issues by tag">
+                             repo=repo.name, milestone=tag.tag,
+                             status='All' if not status else None) }}"
+                   title="Filter issues by milestone">
       {% endif %}
 
         {{ tag.tag }}</a>
diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py
index eb33733..abc731a 100644
--- a/pagure/ui/issues.py
+++ b/pagure/ui/issues.py
@@ -490,14 +490,15 @@ def view_roadmap(repo, username=None):
     milestone_issues = defaultdict(list)
     for cnt in range(len(issues)):
         saved = False
-        for milestone in sorted(milestones):
-            if milestone in issues[cnt].tags_text:
-                milestone_issues[milestone].append(issues[cnt])
+        for mlstone in sorted(milestones):
+            if mlstone in issues[cnt].tags_text:
+                milestone_issues[mlstone].append(issues[cnt])
                 saved = True
                 break
         if saved:
             continue
-        milestone_issues['unplaned'].append(issues[cnt])
+        if not milestone:
+            milestone_issues['unplaned'].append(issues[cnt])
 
     if status:
         for key in milestone_issues.keys():
@@ -528,7 +529,7 @@ def view_roadmap(repo, username=None):
         status=status,
         milestones=milestones_ordered,
         issues=milestone_issues,
-        tags=tags,
+        tags=milestone,
         repo_admin=is_repo_admin(repo),
         repo_obj=repo_obj,
     )