diff --git a/frontend/templates/explore.html b/frontend/templates/explore.html
index 9382205a..a75b722d 100644
--- a/frontend/templates/explore.html
+++ b/frontend/templates/explore.html
@@ -23,9 +23,9 @@
                             {% if pubname %}
                                 <li>{{ pubname }}...
                                 <ul class="menu level3">
-                                    <li class="first"><a href="{% url bypub_list pubname 'popular' %}"><span>Most popular</span></a></li>
+                                    <li class="first"><a href="{% url bypub_list 'popular' pubname %}"><span>Most popular</span></a></li>
                                     <li><a href="{% url bypub_list pubname %}"><span>By Title</span></a></li>
-                                    <li><a href="{% url bypub_list pubname 'pubdate' %}"><span>By Date Published</span></a></li>
+                                    <li><a href="{% url bypub_list 'pubdate' pubname %}"><span>By Date Published</span></a></li>
                                 </ul>
                                 </li>
                              {% endif %}
diff --git a/frontend/urls.py b/frontend/urls.py
index da2a1779..035b3b7a 100644
--- a/frontend/urls.py
+++ b/frontend/urls.py
@@ -37,8 +37,8 @@ urlpatterns = patterns(
     url(r"^wishlist/$", "wishlist", name="wishlist"),
     url(r"^campaigns/(?P<facet>\w*)$", CampaignListView.as_view(), name='campaign_list'),
     url(r"^lists/(?P<facet>\w*)$", WorkListView.as_view(),  name='work_list'),
-    url(r"^bypub/(?P<pubname>[^/]*)/(?P<facet>\w*)$", ByPubListView.as_view(),  name='bypub_list'),
-    url(r"^bypub/(?P<pubname>[^/]*)$", ByPubListView.as_view(),  name='bypub_list'),
+    url(r"^bypub/all/(?P<pubname>.*)$", ByPubListView.as_view(),  name='bypub_list'),
+    url(r"^bypub/(?P<facet>\w*)/(?P<pubname>.*)$", ByPubListView.as_view(),  name='bypub_list'),
     url(r"^unglued/(?P<facet>\w*)$", UngluedListView.as_view(),  name='unglued_list'),
     url(r"^goodreads/auth/$", "goodreads_auth", name="goodreads_auth"),
     url(r"^goodreads/auth_cb/$", "goodreads_cb", name="goodreads_cb"),