diff --git a/dashboard-ui/scripts/edititemsubtitles.js b/dashboard-ui/scripts/edititemsubtitles.js
index 3750fec284..545c64e0dd 100644
--- a/dashboard-ui/scripts/edititemsubtitles.js
+++ b/dashboard-ui/scripts/edititemsubtitles.js
@@ -59,15 +59,15 @@
 
         }).done(function () {
 
-            Dashboard.alert('The download has been queued.');
+            Dashboard.alert(Globalize.translate('MessageDownloadQueued'));
         });
     }
 
     function deleteLocalSubtitle(page, index) {
 
-        var msg = "Are you sure you wish to delete this subtitle file?";
+        var msg = Globalize.translate('MessageAreYouSureDeleteSubtitles');
 
-        Dashboard.confirm(msg, "Confirm Deletion", function (result) {
+        Dashboard.confirm(msg, Globalize.translate('HeaderConfirmDeletion'), function (result) {
 
             if (result) {
 
@@ -103,7 +103,7 @@
         if (subs.length) {
 
             html += '<br/>';
-            html += '<ul data-role="listview" data-split-icon="delete"><li data-role="list-divider">Current Subtitles</li>';
+            html += '<ul data-role="listview" data-split-icon="delete"><li data-role="list-divider">' + Globalize.translate('HeaderCurrentSubtitles') + '</li>';
 
             html += subs.map(function (s) {
 
@@ -111,7 +111,7 @@
 
                 var itemHtml = '<li><a class="' + cssClass + '" href="#" data-index="' + s.Index + '">';
 
-                itemHtml += '<p>' + (s.Language || 'Unknown language') + '</p>';
+                itemHtml += '<p>' + (s.Language || Globalize.translate('LabelUnknownLanaguage')) + '</p>';
 
                 if (s.IsDefault || s.IsForced) {
 
@@ -228,7 +228,7 @@
 
             html += '</a>';
 
-            html += '<a href="#" class="btnDownload" data-icon="plus" data-subid="' + result.Id + '">Download</a>';
+            html += '<a href="#" class="btnDownload" data-icon="plus" data-subid="' + result.Id + '">' + Globalize.translate('ButtonDownload') + '</a>';
 
             html += '</li>';
         }
diff --git a/dashboard-ui/scripts/editorsidebar.js b/dashboard-ui/scripts/editorsidebar.js
index b1b24f3338..bcaf1d6873 100644
--- a/dashboard-ui/scripts/editorsidebar.js
+++ b/dashboard-ui/scripts/editorsidebar.js
@@ -315,68 +315,12 @@
 
         function ensureInitialValues() {
 
-            if (self.currentItemType || self.currentItemName || self.currentItemId) {
+            if (self.currentItemType || self.currentItemId) {
                 return;
             }
 
             var url = window.location.hash || window.location.toString();
 
-            var name = getParameterByName('person', url);
-
-            if (name) {
-                self.currentItemType = "Person";
-                self.currentItemName = name;
-                return;
-            }
-
-            name = getParameterByName('studio', url);
-
-            if (name) {
-                self.currentItemType = "Studio";
-                self.currentItemName = name;
-                return;
-            }
-
-            name = getParameterByName('genre', url);
-
-            if (name) {
-                self.currentItemType = "Genre";
-                self.currentItemName = name;
-                return;
-            }
-
-            name = getParameterByName('musicgenre', url);
-
-            if (name) {
-                self.currentItemType = "MusicGenre";
-                self.currentItemName = name;
-                return;
-            }
-
-            name = getParameterByName('gamegenre', url);
-
-            if (name) {
-                self.currentItemType = "GameGenre";
-                self.currentItemName = name;
-                return;
-            }
-
-            name = getParameterByName('musicartist', url);
-
-            if (name) {
-                self.currentItemType = "MusicArtist";
-                self.currentItemName = name;
-                return;
-            }
-
-            name = getParameterByName('channelid', url);
-
-            if (name) {
-                self.currentItemType = "TvChannel";
-                self.currentItemId = name;
-                return;
-            }
-
             var id = getParameterByName('id', url);
 
             if (id) {
@@ -388,37 +332,12 @@
         self.getItemPromise = function () {
 
             var currentItemType = self.currentItemType;
-            var currentItemName = self.currentItemName;
             var currentItemId = self.currentItemId;
 
             if (currentItemType == "TvChannel") {
                 return ApiClient.getLiveTvChannel(currentItemId);
             }
 
-            if (currentItemType == "Person") {
-                return ApiClient.getPerson(currentItemName, Dashboard.getCurrentUserId());
-            }
-
-            if (currentItemType == "Studio") {
-                return ApiClient.getStudio(currentItemName, Dashboard.getCurrentUserId());
-            }
-
-            if (currentItemType == "Genre") {
-                return ApiClient.getGenre(currentItemName, Dashboard.getCurrentUserId());
-            }
-
-            if (currentItemType == "MusicGenre") {
-                return ApiClient.getMusicGenre(currentItemName, Dashboard.getCurrentUserId());
-            }
-
-            if (currentItemType == "GameGenre") {
-                return ApiClient.getGameGenre(currentItemName, Dashboard.getCurrentUserId());
-            }
-
-            if (currentItemType == "MusicArtist" && currentItemName) {
-                return ApiClient.getArtist(currentItemName, Dashboard.getCurrentUserId());
-            }
-
             if (currentItemId) {
                 return ApiClient.getItem(Dashboard.getCurrentUserId(), currentItemId);
             }
@@ -428,19 +347,7 @@
 
         self.getEditQueryString = function (item) {
 
-            var query;
-
-            if (item.Type == "Person" ||
-                item.Type == "Studio" ||
-                item.Type == "Genre" ||
-                item.Type == "MusicGenre" ||
-                item.Type == "GameGenre" ||
-                item.Type == "MusicArtist") {
-                query = item.Type + "=" + ApiClient.encodeName(item.Name);
-
-            } else {
-                query = "id=" + item.Id;
-            }
+            var query = "id=" + item.Id;
 
             var context = getParameterByName('context');
 
diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js
index 3a2e4df509..9e0f90973c 100644
--- a/dashboard-ui/scripts/itembynamedetailpage.js
+++ b/dashboard-ui/scripts/itembynamedetailpage.js
@@ -50,9 +50,18 @@
     function reload(page) {
 
         Dashboard.showLoadingMsg();
+        $('#btnEdit', page).attr('href', '#');
 
         getPromise().done(function (item) {
 
+            var context = getParameterByName('context');
+
+            var editQuery = '?id=' + item.Id;
+            if (context) {
+                editQuery += '&context=' + context;
+            }
+            $('#btnEdit', page).attr('href', 'edititemmetadata.html' + editQuery);
+
             currentItem = item;
 
             renderHeader(page, item);
@@ -69,7 +78,7 @@
             $(page).trigger('displayingitem', [{
 
                 item: item,
-                context: getParameterByName('context')
+                context: context
             }]);
 
             Dashboard.getCurrentUser().done(function (user) {
@@ -80,7 +89,8 @@
                     $('#playButtonContainer', page).hide();
                 }
 
-                var editImagesHref = user.Configuration.IsAdministrator ? 'edititemimages.html' + getWindowLocationSearch() : null;
+                var editImagesHref = user.Configuration.IsAdministrator ? 'edititemimages.html' + editQuery : null;
+
                 $('#itemImage', page).html(LibraryBrowser.getDetailImageHtml(item, editImagesHref));
 
                 if (user.Configuration.IsAdministrator && item.LocationType !== "Offline") {
@@ -520,8 +530,6 @@
 
         reload(page);
 
-        $('#btnEdit', page).attr('href', 'edititemmetadata.html' + getWindowLocationSearch());
-
     }).on('pagehide', "#itemByNameDetailPage", function () {
 
         currentItem = null;