diff --git a/static/js/pandora/URL.js b/static/js/pandora/URL.js
index 85483443..a1e5b6af 100644
--- a/static/js/pandora/URL.js
+++ b/static/js/pandora/URL.js
@@ -36,14 +36,16 @@ pandora.URL = (function() {
             state.view = 'map';
             state.span = pandora.user.ui.mapSelection
                 ? '@' + pandora.user.ui.mapSelection : '';
-            state.sort = pandora.user.ui.sort;
+            state.sort = !pandora.user.ui.item
+                ? pandora.user.ui.listSort : pandora.user.ui.itemSort;
         }
         if (!keys || keys.indexOf('mapFind') > -1) {
             state.item = pandora.user.ui.item;
             state.view = 'map';
             state.span = pandora.user.ui.mapFind
                 ? '@' + pandora.user.ui.mapFind : '';
-            state.sort = pandora.user.ui.sort;
+            state.sort = !pandora.user.ui.item
+                ? pandora.user.ui.listSort : pandora.user.ui.itemSort;
         }
         if (!keys || keys.filter(function(key) {
             return /^videoPoints/.test(key);
@@ -77,6 +79,11 @@ pandora.URL = (function() {
                 state.view = pandora.user.ui.itemView;
                 state.sort = pandora.user.ui.itemSort;
             }
+            if (pandora.user.ui.mapSelection) {
+                state.span = '@' + pandora.user.ui.mapSelection;
+            } else if (pandora.user.ui.mapFind) {
+                state.span = '@' + pandora.user.ui.mapFind;
+            }
             /*
             : pandora.isClipView(pandora.user.ui.itemView)
                 ? pandora.user.ui.itemSort : [],