diff --git a/data/interfaces/default/current_activity.html b/data/interfaces/default/current_activity.html
index 54d612fd..bb0949e0 100644
--- a/data/interfaces/default/current_activity.html
+++ b/data/interfaces/default/current_activity.html
@@ -69,7 +69,7 @@ DOCUMENTATION :: END
 % for a in data['sessions']:
 <div class="dashboard-instance" id="instance-${a['session_key']}">
     % if a['media_type'] == 'movie' or a['media_type'] == 'episode' or a['media_type'] == 'track':
-    <a href="info?item_id=${a['rating_key']}">
+    <a href="info?rating_key=${a['rating_key']}">
     % endif
         <div class="dashboard-activity-poster">
             % if a['media_type'] == 'movie' and not a['indexes']:
@@ -227,13 +227,13 @@ DOCUMENTATION :: END
             <i class="fa fa-spinner"></i>&nbsp;
             % endif
             % if a['media_type'] == 'episode':
-            <a href="info?item_id=${a['rating_key']}" title="${a['grandparent_title']} - ${a['title']}">${a['grandparent_title']} - ${a['title']}</a>
+            <a href="info?rating_key=${a['rating_key']}" title="${a['grandparent_title']} - ${a['title']}">${a['grandparent_title']} - ${a['title']}</a>
             % elif a['media_type'] == 'movie':
-            <a href="info?item_id=${a['rating_key']}" title="${a['title']}">${a['title']}</a>
+            <a href="info?rating_key=${a['rating_key']}" title="${a['title']}">${a['title']}</a>
             % elif a['media_type'] == 'clip':
             <span title="${a['title']}">${a['title']}</span>
             % elif a['media_type'] == 'track':
-            <a href="info?item_id=${a['rating_key']}" title="${a['grandparent_title']} - ${a['title']}">${a['grandparent_title']} - ${a['title']}</a>
+            <a href="info?rating_key=${a['rating_key']}" title="${a['grandparent_title']} - ${a['title']}">${a['grandparent_title']} - ${a['title']}</a>
             % elif a['media_type'] == 'photo':
             <span title="${a['parent_title']}">${a['parent_title']}</span>
             % else:
@@ -246,7 +246,7 @@ DOCUMENTATION :: END
             % elif a['media_type'] == 'movie':
             <span title="${a['year']}">${a['year']}</span>
             % elif a['media_type'] == 'track':
-            <a href="info?item_id=${a['parent_rating_key']}" title="${a['parent_title']}">${a['parent_title']}</a>
+            <a href="info?rating_key=${a['parent_rating_key']}" title="${a['parent_title']}">${a['parent_title']}</a>
             % elif a['media_type'] == 'photo':
             <span title="${a['title']}">${a['title']}</span>
             % else:
diff --git a/data/interfaces/default/home_stats.html b/data/interfaces/default/home_stats.html
index fa4ac42d..419bf1b9 100644
--- a/data/interfaces/default/home_stats.html
+++ b/data/interfaces/default/home_stats.html
@@ -83,7 +83,7 @@ DOCUMENTATION :: END
                 </div>
                 <div class="home-platforms-instance-playcount">
                     <h4>
-                        <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                        <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
                     </h4>
@@ -95,7 +95,7 @@ DOCUMENTATION :: END
                     % endif
                 </div>
             </div>
-            <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+            <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                 % if top_stat['rows'][0]['grandparent_thumb']:
                 <div class="home-platforms-instance-poster">
                     <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['grandparent_thumb']}&width=300&height=450&fallback=poster);"></div>
@@ -117,7 +117,7 @@ DOCUMENTATION :: END
                             <div class="home-platforms-instance-list-info">
                                 <div class="home-platforms-instance-list-name">
                                     <h5>
-                                        <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                        <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                             ${top_stat['rows'][loop.index]['title']}
                                         </a>
                                     </h5>
@@ -131,7 +131,7 @@ DOCUMENTATION :: END
                                     % endif
                                 </div>
                             </div>
-                            <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                            <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                             % if top_stat['rows'][loop.index]['grandparent_thumb']:
                             <div class="home-platforms-instance-list-poster">
                                 <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['grandparent_thumb']}&width=300&height=450&fallback=poster);"></div>
@@ -163,7 +163,7 @@ DOCUMENTATION :: END
                 </div>
                 <div class="home-platforms-instance-playcount">
                     <h4>
-                        <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                        <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
                     </h4>
@@ -171,7 +171,7 @@ DOCUMENTATION :: END
                     <p> users</p>
                 </div>
             </div>
-            <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+            <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                 % if top_stat['rows'][0]['grandparent_thumb'] != '':
                 <div class="home-platforms-instance-poster">
                     <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['grandparent_thumb']}&width=300&height=450&fallback=poster);"></div>
@@ -193,7 +193,7 @@ DOCUMENTATION :: END
                             <div class="home-platforms-instance-list-info">
                                 <div class="home-platforms-instance-list-name">
                                     <h5>
-                                        <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                        <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                             ${top_stat['rows'][loop.index]['title']}
                                         </a>
                                     </h5>
@@ -203,7 +203,7 @@ DOCUMENTATION :: END
                                     <p> users</p>
                                 </div>
                             </div>
-                            <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                            <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                 % if top_stat['rows'][loop.index]['grandparent_thumb']:
                                 <div class="home-platforms-instance-list-poster">
                                     <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['grandparent_thumb']}&width=300&height=450&fallback=poster);"></div>
@@ -235,7 +235,7 @@ DOCUMENTATION :: END
                 </div>
                 <div class="home-platforms-instance-playcount">
                     <h4>
-                        <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                        <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
                     </h4>
@@ -247,7 +247,7 @@ DOCUMENTATION :: END
                     % endif
                 </div>
             </div>
-            <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+            <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                 % if top_stat['rows'][0]['thumb']:
                 <div class="home-platforms-instance-poster">
                     <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['thumb']}&width=300&height=450&fallback=poster);"></div>
@@ -269,7 +269,7 @@ DOCUMENTATION :: END
                             <div class="home-platforms-instance-list-info">
                                 <div class="home-platforms-instance-list-name">
                                     <h5>
-                                        <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                        <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                             ${top_stat['rows'][loop.index]['title']}
                                         </a>
                                     </h5>
@@ -283,7 +283,7 @@ DOCUMENTATION :: END
                                     % endif
                                 </div>
                             </div>
-                            <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                            <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                 % if top_stat['rows'][loop.index]['thumb']:
                                 <div class="home-platforms-instance-list-poster">
                                     <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['thumb']}&width=300&height=450&fallback=poster);"></div>
@@ -315,7 +315,7 @@ DOCUMENTATION :: END
                 </div>
                 <div class="home-platforms-instance-playcount">
                     <h4>
-                        <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                        <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
                     </h4>
@@ -323,7 +323,7 @@ DOCUMENTATION :: END
                     <p> users</p>
                 </div>
             </div>
-            <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+            <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                 % if top_stat['rows'][0]['thumb']:
                 <div class="home-platforms-instance-poster">
                     <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['thumb']}&width=300&height=450&fallback=poster);"></div>
@@ -345,7 +345,7 @@ DOCUMENTATION :: END
                             <div class="home-platforms-instance-list-info">
                                 <div class="home-platforms-instance-list-name">
                                     <h5>
-                                        <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                        <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                             ${top_stat['rows'][loop.index]['title']}
                                         </a>
                                     </h5>
@@ -355,7 +355,7 @@ DOCUMENTATION :: END
                                     <p> users</p>
                                 </div>
                             </div>
-                            <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                            <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                 % if top_stat['rows'][loop.index]['thumb']:
                                 <div class="home-platforms-instance-list-poster">
                                     <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['thumb']}&width=300&height=450&fallback=poster);"></div>
@@ -387,7 +387,7 @@ DOCUMENTATION :: END
                 </div>
                 <div class="home-platforms-instance-playcount">
                     <h4>
-                        <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                        <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
                     </h4>
@@ -399,7 +399,7 @@ DOCUMENTATION :: END
                     % endif
                 </div>
             </div>
-            <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+            <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                 % if top_stat['rows'][0]['grandparent_thumb']:
                 <div class="home-platforms-instance-poster">
                     <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['grandparent_thumb']}&width=300&height=300&fallback=poster);"></div>
@@ -421,7 +421,7 @@ DOCUMENTATION :: END
                             <div class="home-platforms-instance-list-info">
                                 <div class="home-platforms-instance-list-name">
                                     <h5>
-                                        <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                        <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                             ${top_stat['rows'][loop.index]['title']}
                                         </a>
                                     </h5>
@@ -435,7 +435,7 @@ DOCUMENTATION :: END
                                     % endif
                                 </div>
                             </div>
-                            <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                            <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                 % if top_stat['rows'][loop.index]['grandparent_thumb']:
                                 <div class="home-platforms-instance-list-poster">
                                     <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['grandparent_thumb']}&width=300&height=300&fallback=poster);"></div>
@@ -467,7 +467,7 @@ DOCUMENTATION :: END
                 </div>
                 <div class="home-platforms-instance-playcount">
                     <h4>
-                        <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                        <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
                     </h4>
@@ -475,7 +475,7 @@ DOCUMENTATION :: END
                     <p> users</p>
                 </div>
             </div>
-            <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+            <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                 % if top_stat['rows'][0]['grandparent_thumb'] != '':
                 <div class="home-platforms-instance-poster">
                     <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['grandparent_thumb']}&width=300&height=300&fallback=poster);"></div>
@@ -497,7 +497,7 @@ DOCUMENTATION :: END
                             <div class="home-platforms-instance-list-info">
                                 <div class="home-platforms-instance-list-name">
                                     <h5>
-                                        <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                        <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                             ${top_stat['rows'][loop.index]['title']}
                                         </a>
                                     </h5>
@@ -507,7 +507,7 @@ DOCUMENTATION :: END
                                     <p> users</p>
                                 </div>
                             </div>
-                            <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                            <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                 % if top_stat['rows'][loop.index]['grandparent_thumb']:
                                 <div class="home-platforms-instance-list-poster">
                                     <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['grandparent_thumb']}&width=300&height=300&fallback=poster);"></div>
@@ -697,7 +697,7 @@ DOCUMENTATION :: END
                 </div>
                 <div class="home-platforms-instance-last-user">
                     <h4>
-                        <a href="info?source=history&item_id=${top_stat['rows'][0]['row_id']}" title="${top_stat['rows'][0]['title']}">
+                        <a href="info?source=history&rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
                     </h4>
@@ -719,7 +719,7 @@ DOCUMENTATION :: END
                     </p>
                 </div>
             </div>
-            <a href="info?source=history&item_id=${top_stat['rows'][0]['row_id']}" title="${top_stat['rows'][0]['title']}">
+            <a href="info?source=history&rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                 % if top_stat['rows'][0]['thumb']:
                 <div class="home-platforms-instance-poster">
                     <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['thumb']}&width=300&height=450&fallback=poster);"></div>
@@ -741,7 +741,7 @@ DOCUMENTATION :: END
                             <div class="home-platforms-instance-list-info">
                                 <div class="home-platforms-instance-list-name">
                                     <h5>
-                                        <a href="info?source=history&item_id=${top_stat['rows'][loop.index]['row_id']}" title="${top_stat['rows'][loop.index]['title']}">
+                                        <a href="info?source=history&rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                             ${top_stat['rows'][loop.index]['title']}
                                         </a>
                                     </h5>
@@ -765,7 +765,7 @@ DOCUMENTATION :: END
                                     </p>
                                 </div>
                             </div>
-                            <a href="info?source=history&item_id=${top_stat['rows'][loop.index]['row_id']}" title="${top_stat['rows'][loop.index]['title']}">
+                            <a href="info?source=history&rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                 % if top_stat['rows'][loop.index]['thumb']:
                                 <div class="home-platforms-instance-list-poster">
                                     <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['thumb']}&width=300&height=450&fallback=poster);"></div>
diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html
index efcdaf56..b6c3a51e 100644
--- a/data/interfaces/default/info.html
+++ b/data/interfaces/default/info.html
@@ -32,19 +32,6 @@ directors               Returns an array of directors.
 studio                  Returns the name of the studio.
 originally_available_at Returns the air date of the item.
 
-query :: Usable parameters
-
-== Global keys ==
-query_string            Returns the string used for the search query.
-title                   Returns the name of the movie, episode, or track.
-parent_title            Returns the name of the album.
-grandparent_title       Returns the name of the show, or artist.
-media_index             Returns the index number of the episode, or track.
-parent_media_index      Returns the index number of the season.
-year                    Returns the release year of the movie, or show.
-media_type              Returns the type of media. Either 'movie', 'show', 'season', 'episode', 'artist', 'album', or 'track'.
-rating_key              Returns the unique identifier for the media item.
-
 DOCUMENTATION :: END
 </%doc>
 
@@ -76,24 +63,24 @@ DOCUMENTATION :: END
                         <li class="active">${data['title']}</li>
                         % elif data['media_type'] == 'season':
                         <li class="hidden-xs hidden-sm"><a href="info?library_id=${data['library_id']}">${data['library_title']}</a></li>
-                        <li><a href="info?item_id=${data['parent_rating_key']}">${data['parent_title']}</a></li>
+                        <li><a href="info?rating_key=${data['parent_rating_key']}">${data['parent_title']}</a></li>
                         <li class="active">Season ${data['media_index']}</li>
                         % elif data['media_type'] == 'episode':
                         <li class="hidden-xs hidden-sm"><a href="info?library_id=${data['library_id']}">${data['library_title']}</a></li>
-                        <li class="hidden-xs hidden-sm"><a href="info?item_id=${data['grandparent_rating_key']}">${data['grandparent_title']}</a></li>
-                        <li><a href="info?item_id=${data['parent_rating_key']}">Season ${data['parent_media_index']}</a></li>
+                        <li class="hidden-xs hidden-sm"><a href="info?rating_key=${data['grandparent_rating_key']}">${data['grandparent_title']}</a></li>
+                        <li><a href="info?rating_key=${data['parent_rating_key']}">Season ${data['parent_media_index']}</a></li>
                         <li class="active">Episode ${data['media_index']} - ${data['title']}</li>
                         % elif data['media_type'] == 'artist':
                         <li><a href="info?library_id=${data['library_id']}">${data['library_title']}</a></li>
                         <li class="active">${data['title']}</li>
                         % elif data['media_type'] == 'album':
                         <li class="hidden-xs hidden-sm"><a href="info?library_id=${data['library_id']}">${data['library_title']}</a></li>
-                        <li><a href="info?item_id=${data['parent_rating_key']}">${data['parent_title']}</a></li>
+                        <li><a href="info?rating_key=${data['parent_rating_key']}">${data['parent_title']}</a></li>
                         <li class="active">${data['title']}</li>
                         % elif data['media_type'] == 'track':
                         <li class="hidden-xs hidden-sm"><a href="info?library_id=${data['library_id']}">${data['library_title']}</a></li>
-                        <li class="hidden-xs hidden-sm"><a href="info?item_id=${data['grandparent_rating_key']}">${data['grandparent_title']}</a></li>
-                        <li><a href="info?item_id=${data['parent_rating_key']}">${data['parent_title']}</a></li>
+                        <li class="hidden-xs hidden-sm"><a href="info?rating_key=${data['grandparent_rating_key']}">${data['grandparent_title']}</a></li>
+                        <li><a href="info?rating_key=${data['parent_rating_key']}">${data['parent_title']}</a></li>
                         <li class="active">Track ${data['media_index']} - ${data['title']}</li>
                         % endif
                         </ul>
@@ -134,18 +121,18 @@ DOCUMENTATION :: END
                         % if data['media_type'] == 'movie' or data['media_type'] == 'show' or data['media_type'] == 'artist':
                         <h1>&nbsp;</h1><h1>${data['title']}</h1>
                         % elif data['media_type'] == 'season':
-                        <h1>&nbsp;</h1><h1><a href="info?item_id=${data['parent_rating_key']}">${data['parent_title']}</a></h1>
+                        <h1>&nbsp;</h1><h1><a href="info?rating_key=${data['parent_rating_key']}">${data['parent_title']}</a></h1>
                         <h3 class="hidden-xs">S${data['media_index']}</h3>
                         % elif data['media_type'] == 'episode':
-                        <h1><a href="info?item_id=${data['grandparent_rating_key']}">${data['grandparent_title']}</a></h1>
+                        <h1><a href="info?rating_key=${data['grandparent_rating_key']}">${data['grandparent_title']}</a></h1>
                         <h2>${data['title']}</h2>
                         <h3 class="hidden-xs">S${data['parent_media_index']} &middot; E${data['media_index']}</h3>
                         % elif data['media_type'] == 'album':
-                        <h1><a href="info?item_id=${data['parent_rating_key']}">${data['parent_title']}</a></h1>
+                        <h1><a href="info?rating_key=${data['parent_rating_key']}">${data['parent_title']}</a></h1>
                         <h2>${data['title']}</h2>
                         % elif data['media_type'] == 'track':
-                        <h1><a href="info?item_id=${data['grandparent_rating_key']}">${data['grandparent_title']}</a></h1>
-                        <h2><a href="info?item_id=${data['parent_rating_key']}">${data['parent_title']}</a> - ${data['title']}</h2>
+                        <h1><a href="info?rating_key=${data['grandparent_rating_key']}">${data['grandparent_title']}</a></h1>
+                        <h2><a href="info?rating_key=${data['parent_rating_key']}">${data['parent_title']}</a> - ${data['title']}</h2>
                         <h3 class="hidden-xs">T${data['media_index']}</h3>
                         % endif
                     </div>
@@ -374,111 +361,6 @@ DOCUMENTATION :: END
         </div>
     </div>
 </div>
-% else:
-<div class="container-fluid">
-    <div class="row">
-        <div class="summary-container">
-            <div class="summary-navbar">
-                <div class="col-md-12">
-                    <div class="summary-navbar-list">
-                        <ul class="list-unstyled breadcrumb">
-                            % if query:
-                            % if query['media_type'] == 'movie':
-                            <li><a href="info?item_id=movie">Movies</a></li>
-                            <li class="active">${query['title']}</li>
-                            % elif query['media_type'] == 'show':
-                            <li><a href="info?item_id=show">TV Shows</a></li>
-                            <li class="active">${query['grandparent_title']}</li>
-                            % elif query['media_type'] == 'season':
-                            <li class="hidden-xs hidden-sm"><a href="info?item_id=show">TV Shows</a></li>
-                            <li class="hidden-xs hidden-sm">${query['grandparent_title']}</li>
-                            <li class="active">Season ${query['parent_media_index']}</li>
-                            % elif query['media_type'] == 'episode':
-                            <li class="hidden-xs hidden-sm"><a href="info?item_id=show">TV Shows</a></li>
-                            <li class="hidden-xs hidden-sm">${query['grandparent_title']}</li>
-                            <li>Season ${query['parent_media_index']}</li>
-                            <li class="active">Episode ${query['media_index']} - ${query['title']}</li>
-                            % elif query['media_type'] == 'artist':
-                            <li><a href="info?item_id=artist">Music</a></li>
-                            <li class="active">${query['grandparent_title']}</li>
-                            % elif query['media_type'] == 'album':
-                            <li class="hidden-xs hidden-sm"><a href="info?item_id=artist">Music</a></li>
-                            <li>${query['grandparent_title']}</li>
-                            <li class="active">${query['parent_title']}</li>
-                            % elif query['media_type'] == 'track':
-                            <li class="hidden-xs hidden-sm"><a href="info?item_id=artist">Music</a></li>
-                            <li class="hidden-xs hidden-sm">${query['grandparent_title']}</li>
-                            <li>${query['parent_title']}</li>
-                            <li class="active">Track ${query['media_index']} - ${query['title']}</li>
-                            % endif
-                            % endif
-                        </ul>
-                    </div>
-                </div>
-            </div>
-            <div class="summary-content-wrapper">
-                <div class='col-md-12'>
-                    <div style="text-align: center; margin-top: 20px;">
-                        <i class="fa fa-exclamation-triangle"></i> Error retrieving item metadata. This media item is not available in the Plex Media Server library.
-                    </div>
-                    % if query:
-                    <div style="text-align: center; margin-top: 20px;">
-                        If the item has been moved, please select the correct match below to update the PlexPy database.
-                    </div>
-                    <div class='table-card-header'>
-                        <div class="header-bar">
-                            <span>Search Results for <strong>${query['query_string']}</strong></span>
-                        </div>
-                    </div>
-                    <div class='table-card-back'>
-                        <div id="search-results-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading search results...</div>
-                    </div>
-                    <div class="modal fade" id="confirm-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-modal">
-                        <div class="modal-dialog">
-                            <div class="modal-content">
-                                <div class="modal-header">
-                                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                                    <h4 class="modal-title" id="myModalLabel">Confirm Update</h4>
-                                </div>
-                                <div class="modal-body" style="text-align: center;">
-                                    <p>Are you REALLY sure you want to replace
-                                    <p><strong>
-                                        % if query['media_type'] == 'movie':
-                                        ${query['title']}<br />${query['year']}
-                                        % elif query['media_type'] == 'show':
-                                        ${query['grandparent_title']}
-                                        % elif query['media_type'] == 'season':
-                                        ${query['grandparent_title']}<br />S${query['parent_media_index']}
-                                        % elif query['media_type'] == 'episode':
-                                        ${query['grandparent_title']}<br />${query['title']}<br />S${query['parent_media_index']} &middot; E${query['media_index']}
-                                        % elif query['media_type'] == 'artist':
-                                        ${query['grandparent_title']}
-                                        % elif query['media_type'] == 'album':
-                                        ${query['grandparent_title']}<br />${query['parent_title']}
-                                        % elif query['media_type'] == 'track':
-                                        ${query['grandparent_title']}<br />${query['title']}<br />${query['parent_title']}
-                                        % endif
-                                        </strong></p>
-                                    <p> with </p>
-                                    <p><span id="new_title"></span></p>
-                                    % if query['media_type'] != 'movie':
-                                    <p>All items for <strong>${query['grandparent_title']}</strong> will also be updated.</p>
-                                    % endif
-                                    <p>This is permanent and cannot be undone!</p>
-                                </div>
-                                <div class="modal-footer">
-                                    <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
-                                    <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-update">Update</button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    % endif
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
 % endif
 </%def>
 
@@ -618,13 +500,10 @@ DOCUMENTATION :: END
 </script>
 % endif
 % if data['media_type'] != 'library':
-<!--
 <script>
-    $('#row-edit-mode').after('<a href="info?item_id=${data['rating_key']}" class="btn btn-danger btn-edit" id="fix-metadata" \
-        data-toggle="tooltip" data-placement="left" title="Fix metadata if the item was moved in Plex"><i class="fa fa-wrench"></i> Fix Metadata</a>');
-    $('#fix-metadata').tooltip();
+    $('#row-edit-mode').after('<a href="update_metadata?rating_key=${data['rating_key']}" class="btn btn-danger btn-edit" id="fix-metadata"> \
+        <i class="fa fa-wrench"></i> Fix Metadata</a>');
 </script>
--->
 % endif
 % if data['media_type'] != 'library' and data['rating']:
 <script>
@@ -638,45 +517,5 @@ DOCUMENTATION :: END
     $("#runtime").html(millisecondsToMinutes($("#runtime").text(), true));
     $('div.art-face').animate({ opacity: 0.2 }, { duration: 1000 });
 </script>
-% elif query:
-<script>
-    $.ajax({
-        url: 'get_search_results_children',
-        type: 'GET',
-        async: true,
-        data: {'query': "${query['query_string'].replace('"','\\"')}",
-               'media_type': "${query['media_type']}",
-               'season_index': "${query['parent_media_index']}"
-        },
-        complete: function(xhr, status) {
-        $("#search-results-list").html(xhr.responseText); }
-    });
-    $(document).on('click', '#search-results-list a', function (e) {
-        e.preventDefault();
-        var new_rating_key = $(this).attr("id");
-        var new_href = $(this).attr("href");
-
-        $('#new_title').html($(this).find('.item-children-instance-text-wrapper').html());
-
-        $('#confirm-modal').modal();
-        $('#confirm-modal').one('click', '#confirm-update', function () {
-            $(this).prop('disabled', true);
-            var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspUpdating database..."
-            showMsg(msg, false, false, 0)
-
-            $.ajax({
-                url: 'update_history_rating_key',
-                data: { old_rating_key: "${query['rating_key']}",
-                    new_rating_key: new_rating_key,
-                    media_type: "${query['media_type']}"
-                    },
-                async: true,
-                success: function (data) {
-                    window.location.href = new_href;
-                }
-            });
-        });
-    });
-</script>
 % endif
 </%def>
diff --git a/data/interfaces/default/info_children_list.html b/data/interfaces/default/info_children_list.html
index cae9425b..decb2049 100644
--- a/data/interfaces/default/info_children_list.html
+++ b/data/interfaces/default/info_children_list.html
@@ -37,7 +37,7 @@ DOCUMENTATION :: END
         % else:
         <li>
         % endif
-            <a href="info?item_id=${child['rating_key']}">
+            <a href="info?rating_key=${child['rating_key']}">
                 %if data['children_type'] == 'season':
                 <div class="item-children-poster">
                     % if child['thumb']:
diff --git a/data/interfaces/default/info_search_results_list.html b/data/interfaces/default/info_search_results_list.html
index 7b83fbcb..a233e735 100644
--- a/data/interfaces/default/info_search_results_list.html
+++ b/data/interfaces/default/info_search_results_list.html
@@ -62,7 +62,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['movie']:
         <li>
-            <a href="info?item_id=${child['rating_key']}" id="${child['rating_key']}">
+            <a href="info?rating_key=${child['rating_key']}" id="${child['rating_key']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face season-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450);"></div>
                 </div>
@@ -84,7 +84,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['show']:
         <li>
-            <a href="info?item_id=${child['rating_key']}" id="${child['rating_key']}">
+            <a href="info?rating_key=${child['rating_key']}" id="${child['rating_key']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face season-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450);"></div>
                 </div>
@@ -106,7 +106,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['season']:
         <li>
-            <a href="info?item_id=${child['rating_key']}" id="${child['rating_key']}">
+            <a href="info?rating_key=${child['rating_key']}" id="${child['rating_key']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face season-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450);"></div>
                 </div>
@@ -128,7 +128,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['episode']:
         <li>
-            <a href="info?item_id=${child['rating_key']}" id="${child['rating_key']}">
+            <a href="info?rating_key=${child['rating_key']}" id="${child['rating_key']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face episode-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450);"></div>
                 </div>
@@ -151,7 +151,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['artist']:
         <li>
-            <a href="info?item_id=${child['rating_key']}" id="${child['rating_key']}">
+            <a href="info?rating_key=${child['rating_key']}" id="${child['rating_key']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face album-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=300);"></div>
                 </div>
@@ -172,7 +172,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['album']:
         <li>
-            <a href="info?item_id=${child['rating_key']}" id="${child['rating_key']}">
+            <a href="info?rating_key=${child['rating_key']}" id="${child['rating_key']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face album-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=300);"></div>
                 </div>
@@ -194,7 +194,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['track']:
         <li>
-            <a href="info?item_id=${child['rating_key']}" id="${child['rating_key']}">
+            <a href="info?rating_key=${child['rating_key']}" id="${child['rating_key']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face album-poster" style="background-image: url(pms_image_proxy?img=${child['parent_thumb']}&width=300&height=300);">
                         <div class="item-children-card-overlay">
diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js
index 516ed0bc..4ae7aa13 100644
--- a/data/interfaces/default/js/tables/history_table.js
+++ b/data/interfaces/default/js/tables/history_table.js
@@ -138,18 +138,18 @@ history_table_options = {
                     if (rowData['media_type'] === 'movie') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Movie"><i class="fa fa-film fa-fw"></i></span>';
                         thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120">' + cellData + ' (' + rowData['year'] + ')</span>'
-                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
+                        $(td).html('<div class="history-title"><a href="info?source=history&rating_key=' + rowData['rating_key'] + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'episode') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Episode"><i class="fa fa-television fa-fw"></i></span>';
                         thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120">' + cellData + ' \
                             (S' + rowData['parent_media_index'] + '&middot; E' + rowData['media_index'] + ')</span>'
-                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;" >' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
+                        $(td).html('<div class="history-title"><a href="info?source=history&rating_key=' + rowData['rating_key'] + '"><div style="float: left;" >' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'track') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>';
                         thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=300&fallback=poster" data-height="80">' + cellData + ' (' + rowData['parent_title'] + ')</span>'
-                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
+                        $(td).html('<div class="history-title"><a href="info?source=history&rating_key=' + rowData['rating_key'] + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                     } else {
-                        $(td).html('<a href="info?item_id=' + rowData['id'] + '">' + cellData + '</a>');
+                        $(td).html('<a href="info?rating_key=' + rowData['rating_key'] + '">' + cellData + '</a>');
                     }
                 }
             },
diff --git a/data/interfaces/default/js/tables/history_table_modal.js b/data/interfaces/default/js/tables/history_table_modal.js
index 1080bdc3..a49b4c18 100644
--- a/data/interfaces/default/js/tables/history_table_modal.js
+++ b/data/interfaces/default/js/tables/history_table_modal.js
@@ -99,18 +99,18 @@ history_table_modal_options = {
                     if (rowData['media_type'] === 'movie') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Movie"><i class="fa fa-film fa-fw"></i></span>';
                         thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120">' + cellData + ' (' + rowData['year'] + ')</span>'
-                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;">' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
+                        $(td).html('<div class="history-title"><a href="info?source=history&rating_key=' + rowData['rating_key'] + '"><div style="float: left;">' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'episode') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Episode"><i class="fa fa-television fa-fw"></i></span>';
                         thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120">' + cellData + ' \
                             (S' + rowData['parent_media_index'] + '&middot; E' + rowData['media_index'] + ')</span>'
-                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;" >' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
+                        $(td).html('<div class="history-title"><a href="info?source=history&rating_key=' + rowData['rating_key'] + '"><div style="float: left;" >' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'track') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>';
                         thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=300&fallback=poster" data-height="80">' + cellData + ' (' + rowData['parent_title'] + ')</span>'
-                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;">' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
+                        $(td).html('<div class="history-title"><a href="info?source=history&rating_key=' + rowData['rating_key'] + '"><div style="float: left;">' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
                     } else {
-                        $(td).html('<a href="info?item_id=' + rowData['id'] + '">' + cellData + '</a>');
+                        $(td).html('<a href="info?rating_key=' + rowData['rating_key'] + '">' + cellData + '</a>');
                     }
                 }
             }
diff --git a/data/interfaces/default/js/tables/sync_table.js b/data/interfaces/default/js/tables/sync_table.js
index f4b85407..94f4e289 100644
--- a/data/interfaces/default/js/tables/sync_table.js
+++ b/data/interfaces/default/js/tables/sync_table.js
@@ -50,7 +50,7 @@ sync_table_options = {
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== '') {
                     if (rowData['metadata_type'] !== '') {
-                        $(td).html('<a href="info?item_id=' + rowData['rating_key'] + '">' + cellData + '</a>');
+                        $(td).html('<a href="info?rating_key=' + rowData['rating_key'] + '">' + cellData + '</a>');
                     } else {
                         $(td).html(cellData);
                     }
diff --git a/data/interfaces/default/js/tables/user_ips.js b/data/interfaces/default/js/tables/user_ips.js
index 506fe43a..95d47764 100644
--- a/data/interfaces/default/js/tables/user_ips.js
+++ b/data/interfaces/default/js/tables/user_ips.js
@@ -89,17 +89,17 @@ user_ip_table_options = {
                     if (rowData['media_type'] === 'movie') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Movie"><i class="fa fa-film fa-fw"></i></span>';
                         thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=80&height=120&fallback=poster" data-height="120">' + cellData + '</span>'
-                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;">' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
+                        $(td).html('<div class="history-title"><a href="info?source=history&rating_key=' + rowData['rating_key'] + '"><div style="float: left;">' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'episode') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Episode"><i class="fa fa-television fa-fw"></i></span>';
                         thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=80&height=120&fallback=poster" data-height="120">' + cellData + '</span>'
-                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;" >' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
+                        $(td).html('<div class="history-title"><a href="info?source=history&rating_key=' + rowData['rating_key'] + '"><div style="float: left;" >' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'track') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>';
                         thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=80&height=80&fallback=poster" data-height="80">' + cellData + '</span>'
-                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;">' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
+                        $(td).html('<div class="history-title"><a href="info?source=history&rating_key=' + rowData['rating_key'] + '"><div style="float: left;">' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type']) {
-                        $(td).html('<a href="info?item_id=' + rowData['id'] + '">' + cellData + '</a>');
+                        $(td).html('<a href="info?rating_key=' + rowData['rating_key'] + '">' + cellData + '</a>');
                     } else {
                         $(td).html('n/a');
                     }
diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js
index ab03435e..dfa1acf7 100644
--- a/data/interfaces/default/js/tables/users.js
+++ b/data/interfaces/default/js/tables/users.js
@@ -148,17 +148,17 @@ users_list_table_options = {
                     if (rowData['media_type'] === 'movie') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Movie"><i class="fa fa-film fa-fw"></i></span>';
                         thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=80&height=120&fallback=poster" data-height="120">' + cellData + '</span>'
-                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;">' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
+                        $(td).html('<div class="history-title"><a href="info?source=history&rating_key=' + rowData['rating_key'] + '"><div style="float: left;">' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'episode') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Episode"><i class="fa fa-television fa-fw"></i></span>';
                         thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=80&height=120&fallback=poster" data-height="120">' + cellData + '</span>'
-                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;" >' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
+                        $(td).html('<div class="history-title"><a href="info?source=history&rating_key=' + rowData['rating_key'] + '"><div style="float: left;" >' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'track') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>';
                         thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=80&height=80&fallback=poster" data-height="80">' + cellData + '</span>'
-                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;">' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
+                        $(td).html('<div class="history-title"><a href="info?source=history&rating_key=' + rowData['rating_key'] + '"><div style="float: left;">' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type']) {
-                        $(td).html('<a href="info?item_id=' + rowData['id'] + '">' + cellData + '</a>');
+                        $(td).html('<a href="info?rating_key=' + rowData['rating_key'] + '">' + cellData + '</a>');
                     } else {
                         $(td).html('n/a');
                     }
diff --git a/data/interfaces/default/recently_added.html b/data/interfaces/default/recently_added.html
index f961801a..48dcf4cc 100644
--- a/data/interfaces/default/recently_added.html
+++ b/data/interfaces/default/recently_added.html
@@ -30,7 +30,7 @@ DOCUMENTATION :: END
         <div class="dashboard-recent-media-instance">
             <li>
                 % if item['media_type'] == 'season' or item['media_type'] == 'movie':
-				<a href="info?item_id=${item['rating_key']}">
+				<a href="info?rating_key=${item['rating_key']}">
 					<div class="dashboard-recent-media-poster">
 						<div class="dashboard-recent-media-poster-face" style="background-image: url(pms_image_proxy?img=${item['thumb']}&width=300&height=450&fallback=poster);">
                             <div class="dashboard-recent-media-overlay">
@@ -53,7 +53,7 @@ DOCUMENTATION :: END
 					</div>
 				</a>
 				% elif item['media_type'] == 'album':
-                <a href="info?item_id=${item['rating_key']}">
+                <a href="info?rating_key=${item['rating_key']}">
                     <div class="dashboard-recent-media-cover">
                         <div class="dashboard-recent-media-cover-face" style="background-image: url(pms_image_proxy?img=${item['thumb']}&width=300&height=300&fallback=cover);">
                             <div class="dashboard-recent-media-overlay">
diff --git a/data/interfaces/default/update_metadata.html b/data/interfaces/default/update_metadata.html
new file mode 100644
index 00000000..5cb33f1e
--- /dev/null
+++ b/data/interfaces/default/update_metadata.html
@@ -0,0 +1,200 @@
+<%doc>
+USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE
+
+For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/
+
+Filename:           update_metadata.html
+Version:            0.1
+Variable names:     query [list]
+
+query :: Usable parameters
+
+== Global keys ==
+query_string            Returns the string used for the search query.
+title                   Returns the name of the movie, episode, or track.
+parent_title            Returns the name of the album.
+grandparent_title       Returns the name of the show, or artist.
+media_index             Returns the index number of the episode, or track.
+parent_media_index      Returns the index number of the season.
+year                    Returns the release year of the movie, or show.
+media_type              Returns the type of media. Either 'movie', 'show', 'season', 'episode', 'artist', 'album', or 'track'.
+rating_key              Returns the unique identifier for the media item.
+
+DOCUMENTATION :: END
+</%doc>
+
+<%inherit file="base.html"/>
+
+<%def name="headIncludes()">
+</%def>
+
+<%def name="body()">
+% if query:
+<div class="container-fluid">
+    <div class="row">
+        <div class="summary-container">
+            <div class="summary-navbar">
+                <div class="col-md-12">
+                    <div class="summary-navbar-list">
+                        <ul class="list-unstyled breadcrumb">
+                            % if query['media_type'] == 'movie':
+                            <li>Movies</li>
+                            <li class="active">${query['title']}</li>
+                            % elif query['media_type'] == 'show':
+                            <li>TV Shows</li>
+                            <li class="active">${query['grandparent_title']}</li>
+                            % elif query['media_type'] == 'season':
+                            <li class="hidden-xs hidden-sm">TV Shows</li>
+                            <li class="hidden-xs hidden-sm">${query['grandparent_title']}</li>
+                            <li class="active">Season ${query['parent_media_index']}</li>
+                            % elif query['media_type'] == 'episode':
+                            <li class="hidden-xs hidden-sm">TV Shows</li>
+                            <li class="hidden-xs hidden-sm">${query['grandparent_title']}</li>
+                            <li>Season ${query['parent_media_index']}</li>
+                            <li class="active">Episode ${query['media_index']} - ${query['title']}</li>
+                            % elif query['media_type'] == 'artist':
+                            <li><Music</li>
+                            <li class="active">${query['grandparent_title']}</li>
+                            % elif query['media_type'] == 'album':
+                            <li class="hidden-xs hidden-sm">Music</li>
+                            <li>${query['grandparent_title']}</li>
+                            <li class="active">${query['parent_title']}</li>
+                            % elif query['media_type'] == 'track':
+                            <li class="hidden-xs hidden-sm">Music</li>
+                            <li class="hidden-xs hidden-sm">${query['grandparent_title']}</li>
+                            <li>${query['parent_title']}</li>
+                            <li class="active">Track ${query['media_index']} - ${query['title']}</li>
+                            % endif
+                        </ul>
+                    </div>
+                </div>
+            </div>
+            <div class="summary-content-wrapper">
+                <div class='col-md-12'>
+                    <div style="text-align: center; margin-top: 20px;">
+                        <i class="fa fa-exclamation-triangle"></i> Error retrieving item metadata. This media item is not available in the Plex Media Server library.
+                    </div>
+                    <div style="text-align: center; margin-top: 20px;">
+                        Please select the correct match below to update the PlexPy database.
+                    </div>
+                    <div class='table-card-header'>
+                        <div class="header-bar">
+                            <span>Search Results for <strong>${query['query_string']}</strong></span>
+                        </div>
+                    </div>
+                    <div class='table-card-back'>
+                        <div id="search-results-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading search results...</div>
+                    </div>
+                    <div class="modal fade" id="confirm-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-modal">
+                        <div class="modal-dialog">
+                            <div class="modal-content">
+                                <div class="modal-header">
+                                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+                                    <h4 class="modal-title" id="myModalLabel">Confirm Update</h4>
+                                </div>
+                                <div class="modal-body" style="text-align: center;">
+                                    <p>Are you REALLY sure you want to replace
+                                    <p><strong>
+                                        % if query['media_type'] == 'movie':
+                                        ${query['title']}<br />${query['year']}
+                                        % elif query['media_type'] == 'show':
+                                        ${query['grandparent_title']}
+                                        % elif query['media_type'] == 'season':
+                                        ${query['grandparent_title']}<br />S${query['parent_media_index']}
+                                        % elif query['media_type'] == 'episode':
+                                        ${query['grandparent_title']}<br />${query['title']}<br />S${query['parent_media_index']} &middot; E${query['media_index']}
+                                        % elif query['media_type'] == 'artist':
+                                        ${query['grandparent_title']}
+                                        % elif query['media_type'] == 'album':
+                                        ${query['grandparent_title']}<br />${query['parent_title']}
+                                        % elif query['media_type'] == 'track':
+                                        ${query['grandparent_title']}<br />${query['title']}<br />${query['parent_title']}
+                                        % endif
+                                        </strong></p>
+                                    <p> with </p>
+                                    <p><span id="new_title"></span></p>
+                                    % if query['media_type'] != 'movie':
+                                    <p>All items for <strong>${query['grandparent_title']}</strong> will also be updated.</p>
+                                    % endif
+                                    <p>This is permanent and cannot be undone!</p>
+                                </div>
+                                <div class="modal-footer">
+                                    <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
+                                    <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-update">Update</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+% else:
+<div class="container-fluid">
+    <div class="row">
+        <div class="summary-container">
+            <div class="summary-navbar">
+                <div class="col-md-12">
+                    <div class="summary-navbar-list">
+                    </div>
+                </div>
+            </div>
+            <div class="summary-content-wrapper">
+                <div class='col-md-12'>
+                    <div style="text-align: center; margin-top: 20px;">
+                        <i class="fa fa-exclamation-triangle"></i> Error retrieving item metadata. This media item is not available in the Plex Media Server library.
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+% endif
+</%def>
+
+<%def name="javascriptIncludes()">
+
+% if query:
+<script>
+    $.ajax({
+        url: 'get_search_results_children',
+        type: 'GET',
+        async: true,
+        data: {'query': "${query['query_string']}",
+               'media_type': "${query['media_type']}",
+               'season_index': "${query['parent_media_index']}"
+        },
+        complete: function(xhr, status) {
+        $("#search-results-list").html(xhr.responseText); }
+    });
+    $(document).on('click', '#search-results-list a', function (e) {
+        e.preventDefault();
+        var new_rating_key = $(this).attr("id");
+        var new_href = $(this).attr("href");
+
+        $('#new_title').html($(this).find('.item-children-instance-text-wrapper').html());
+
+        $('#confirm-modal').modal();
+        $('#confirm-modal').one('click', '#confirm-update', function () {
+            $(this).prop('disabled', true);
+            var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspUpdating database..."
+            showMsg(msg, false, false, 0)
+
+            $.ajax({
+                url: 'update_metadata_details',
+                data: {
+                    old_rating_key: "${query['rating_key']}",
+                    new_rating_key: new_rating_key,
+                    media_type: "${query['media_type']}"
+                    },
+                async: true,
+                success: function (data) {
+                    window.location.href = new_href;
+                }
+            });
+        });
+    });
+</script>
+% endif
+</%def>
diff --git a/data/interfaces/default/user_recently_watched.html b/data/interfaces/default/user_recently_watched.html
index d40ec84b..852c5a89 100644
--- a/data/interfaces/default/user_recently_watched.html
+++ b/data/interfaces/default/user_recently_watched.html
@@ -34,7 +34,7 @@ DOCUMENTATION :: END
         % for item in data:
         <li>
             % if item['type'] == 'episode' or item['type'] == 'movie':
-			<a href="info?source=history&item_id=${item['row_id']}">
+			<a href="info?source=history&rating_key=${item['rating_key']}">
 				<div class="dashboard-recent-media-poster">
 					<div class="dashboard-recent-media-poster-face" style="background-image: url(pms_image_proxy?img=${item['thumb']}&width=300&height=450&fallback=poster);">
                         <div class="dashboard-recent-media-overlay">
@@ -60,7 +60,7 @@ DOCUMENTATION :: END
 				</div>
 			</a>
             % elif item['type'] == 'track':
-            <a href="info?source=history&item_id=${item['row_id']}">
+            <a href="info?source=history&rating_key=${item['rating_key']}">
                 <div class="dashboard-recent-media-cover">
                     <div class="dashboard-recent-media-cover-face" style="background-image: url(pms_image_proxy?img=${item['thumb']}&width=300&height=300&fallback=cover);">
                         <div class="dashboard-recent-media-overlay">
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index a33ca723..c83e6fbb 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -765,10 +765,10 @@ class DataFactory(object):
 
         return recently_watched
 
-    def get_metadata_details(self, row_id):
+    def get_metadata_details(self, rating_key):
         monitor_db = database.MonitorDatabase()
 
-        if row_id:
+        if rating_key:
             query = 'SELECT session_history_metadata.rating_key, session_history_metadata.parent_rating_key, ' \
                     'session_history_metadata.grandparent_rating_key, session_history_metadata.title, ' \
                     'session_history_metadata.parent_title, session_history_metadata.grandparent_title, ' \
@@ -785,8 +785,8 @@ class DataFactory(object):
                     'session_history_metadata.actors, session_history_metadata.genres, session_history_metadata.studio ' \
                     'FROM session_history_metadata ' \
                     'JOIN library_sections ON session_history_metadata.library_id = library_sections.section_id ' \
-                    'WHERE session_history_metadata.id = ?'
-            result = monitor_db.select(query=query, args=[row_id])
+                    'WHERE session_history_metadata.rating_key = ?'
+            result = monitor_db.select(query=query, args=[rating_key])
         else:
             result = []
 
@@ -1041,7 +1041,9 @@ class DataFactory(object):
 
         return key_list
 
-    def update_rating_key(self, old_key_list='', new_key_list='', media_type=''):
+    def update_metadata(self, old_key_list='', new_key_list='', media_type=''):
+        from plexpy import pmsconnect
+        pms_connect = pmsconnect.PmsConnect()
         monitor_db = database.MonitorDatabase()
 
         # function to map rating keys pairs
@@ -1049,8 +1051,7 @@ class DataFactory(object):
             pairs = {}
             for k, v in old.iteritems():
                 if k in new:
-                    if v['rating_key'] != new[k]['rating_key']:
-                        pairs.update({v['rating_key']: new[k]['rating_key']})
+                    pairs.update({v['rating_key']: new[k]['rating_key']})
                     if 'children' in old[k]:
                         pairs.update(get_pairs(old[k]['children'], new[k]['children']))
 
@@ -1062,73 +1063,78 @@ class DataFactory(object):
             mapping = get_pairs(old_key_list, new_key_list)
 
         if mapping:
-            logger.info(u"PlexPy DataFactory :: Updating rating keys in the database.")
+            logger.info(u"PlexPy DataFactory :: Updating metadata in the database.")
             for old_key, new_key in mapping.iteritems():
-                # check library_id (1 table)
-                monitor_db.action('UPDATE session_history_metadata SET library_id = ? WHERE rating_key = ?', 
-                                  [new_key_list['library_id'], old_key])
+                result = pms_connect.get_metadata_details(new_key)
 
-                # check rating_key (3 tables)
-                monitor_db.action('UPDATE session_history SET rating_key = ? WHERE rating_key = ?',
-                                  [new_key, old_key])
-                monitor_db.action('UPDATE session_history_media_info SET rating_key = ? WHERE rating_key = ?',
-                                  [new_key, old_key])
-                monitor_db.action('UPDATE session_history_metadata SET rating_key = ? WHERE rating_key = ?',
-                                  [new_key, old_key])
+                if result:
+                    metadata = result['metadata']
+                    if metadata['media_type'] == 'show' or metadata['media_type'] == 'artist':
+                        # check grandparent_rating_key (2 tables)
+                        monitor_db.action('UPDATE session_history SET grandparent_rating_key = ? WHERE grandparent_rating_key = ?', 
+                                          [new_key, old_key])
+                        monitor_db.action('UPDATE session_history_metadata SET grandparent_rating_key = ? WHERE grandparent_rating_key = ?', 
+                                          [new_key, old_key])
+                    elif metadata['media_type'] == 'season' or metadata['media_type'] == 'album':
+                        # check parent_rating_key (2 tables)
+                        monitor_db.action('UPDATE session_history SET parent_rating_key = ? WHERE parent_rating_key = ?', 
+                                          [new_key, old_key])
+                        monitor_db.action('UPDATE session_history_metadata SET parent_rating_key = ? WHERE parent_rating_key = ?', 
+                                          [new_key, old_key])
+                    else:
+                        # check rating_key (2 tables)
+                        monitor_db.action('UPDATE session_history SET rating_key = ? WHERE rating_key = ?', 
+                                          [new_key, old_key])
+                        monitor_db.action('UPDATE session_history_media_info SET rating_key = ? WHERE rating_key = ?', 
+                                          [new_key, old_key])
 
-                # check parent_rating_key (2 tables)
-                monitor_db.action('UPDATE session_history SET parent_rating_key = ? WHERE parent_rating_key = ?',
-                                  [new_key, old_key])
-                monitor_db.action('UPDATE session_history_metadata SET parent_rating_key = ? WHERE parent_rating_key = ?',
-                                  [new_key, old_key])
+                        # update session_history_metadata table
+                        self.update_metadata_details(old_key, new_key, metadata)
 
-                # check grandparent_rating_key (2 tables)
-                monitor_db.action('UPDATE session_history SET grandparent_rating_key = ? WHERE grandparent_rating_key = ?',
-                                  [new_key, old_key])
-                monitor_db.action('UPDATE session_history_metadata SET grandparent_rating_key = ? WHERE grandparent_rating_key = ?',
-                                  [new_key, old_key])
-
-                # check thumb (1 table)
-                monitor_db.action('UPDATE session_history_metadata SET thumb = replace(thumb, ?, ?) \
-                                  WHERE thumb LIKE "/library/metadata/%s/thumb/%%"' % old_key,
-                                  [old_key, new_key])
-
-                # check parent_thumb (1 table)
-                monitor_db.action('UPDATE session_history_metadata SET parent_thumb = replace(parent_thumb, ?, ?) \
-                                  WHERE parent_thumb LIKE "/library/metadata/%s/thumb/%%"' % old_key,
-                                  [old_key, new_key])
-
-                # check grandparent_thumb (1 table)
-                monitor_db.action('UPDATE session_history_metadata SET grandparent_thumb = replace(grandparent_thumb, ?, ?) \
-                                  WHERE grandparent_thumb LIKE "/library/metadata/%s/thumb/%%"' % old_key,
-                                  [old_key, new_key])
-
-                # check art (1 table)
-                monitor_db.action('UPDATE session_history_metadata SET art = replace(art, ?, ?) \
-                                  WHERE art LIKE "/library/metadata/%s/art/%%"' % old_key,
-                                  [old_key, new_key])
-
-            return 'Updated rating key in database.'
+            return 'Updated metadata in database.'
         else:
-            return 'No updated rating key needed in database. No changes were made.'
+            return 'Unable to update metadata in database. No changes were made.'
         # for debugging
         #return mapping
 
-    def get_session_ip(self, session_key=''):
-        monitor_db = database.MonitorDatabase()
+    def update_metadata_details(self, old_rating_key='', new_rating_key='', metadata=None):
 
-        if session_key:
-            query = 'SELECT ip_address FROM sessions WHERE session_key = %d' % int(session_key)
-            result = monitor_db.select(query)
-        else:
-            return None
+        if metadata:
+            # Create full_title
+            if metadata['media_type'] == 'episode' or metadata['media_type'] == 'track':
+                full_title = '%s - %s' % (metadata['grandparent_title'], metadata['title'])
+            else:
+                full_title = metadata['title']
 
-        ip_address = 'N/A'
+            directors = ";".join(metadata['directors'])
+            writers = ";".join(metadata['writers'])
+            actors = ";".join(metadata['actors'])
+            genres = ";".join(metadata['genres'])
 
-        for item in result:
-            ip_address = item['ip_address']
+            #logger.info(u"PlexPy DataFactory :: Updating metadata in the database for rating key: %s." % new_rating_key)
+            monitor_db = database.MonitorDatabase()
 
-        return ip_address
+            # Update the session_history_metadata table
+            query = 'UPDATE session_history_metadata SET rating_key = ?, parent_rating_key = ?, ' \
+                    'grandparent_rating_key = ?, title = ?, parent_title = ?, grandparent_title = ?, full_title = ?, ' \
+                    'media_index = ?, parent_media_index = ?, library_id = ?, thumb = ?, parent_thumb = ?, ' \
+                    'grandparent_thumb = ?, art = ?, media_type = ?, year = ?, originally_available_at = ?, ' \
+                    'added_at = ?, updated_at = ?, last_viewed_at = ?, content_rating = ?, summary = ?, ' \
+                    'tagline = ?, rating = ?, duration = ?, guid = ?, directors = ?, writers = ?, actors = ?, ' \
+                    'genres = ?, studio = ? ' \
+                    'WHERE rating_key = ?'
+
+            args = [metadata['rating_key'], metadata['parent_rating_key'], metadata['grandparent_rating_key'],
+                    metadata['title'], metadata['parent_title'], metadata['grandparent_title'], full_title,
+                    metadata['media_index'], metadata['parent_media_index'], metadata['library_id'], metadata['thumb'],
+                    metadata['parent_thumb'], metadata['grandparent_thumb'], metadata['art'], metadata['media_type'],
+                    metadata['year'], metadata['originally_available_at'], metadata['added_at'], metadata['updated_at'],
+                    metadata['last_viewed_at'], metadata['content_rating'], metadata['summary'], metadata['tagline'], 
+                    metadata['rating'], metadata['duration'], metadata['guid'], directors, writers, actors, genres,
+                    metadata['studio'],
+                    old_rating_key]
+
+            monitor_db.action(query=query, args=args)
 
     def get_total_duration(self, custom_where=None):
         monitor_db = database.MonitorDatabase()
@@ -1167,8 +1173,8 @@ class DataFactory(object):
             return None
 
         for item in result:
-            id = item[0]
-            rating_key = item[1]
+            id = item['id']
+            rating_key = item['rating_key']
 
             result = pms_connect.get_metadata_details(rating_key=rating_key)
 
@@ -1202,4 +1208,20 @@ class DataFactory(object):
 
                     monitor_db.upsert('library_sections', key_dict=section_keys, value_dict=section_values)
 
-        return True
\ No newline at end of file
+        return True
+
+    def get_session_ip(self, session_key=''):
+        monitor_db = database.MonitorDatabase()
+
+        if session_key:
+            query = 'SELECT ip_address FROM sessions WHERE session_key = %d' % int(session_key)
+            result = monitor_db.select(query)
+        else:
+            return None
+
+        ip_address = 'N/A'
+
+        for item in result:
+            ip_address = item['ip_address']
+
+        return ip_address
\ No newline at end of file
diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py
index 0e2a2654..d88ecf53 100644
--- a/plexpy/pmsconnect.py
+++ b/plexpy/pmsconnect.py
@@ -429,12 +429,14 @@ class PmsConnect(object):
                         'library_id': library_id,
                         'library_title': library_title,
                         'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
-                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
-                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
-                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
-                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
+                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
+                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
                         'title': helpers.get_xml_attr(metadata_main, 'title'),
+                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
+                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
+                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
+                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
                         'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
                         'summary': helpers.get_xml_attr(metadata_main, 'summary'),
                         'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
@@ -462,12 +464,14 @@ class PmsConnect(object):
                         'library_id': library_id,
                         'library_title': library_title,
                         'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
-                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
-                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
-                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
-                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
+                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
+                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
                         'title': helpers.get_xml_attr(metadata_main, 'title'),
+                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
+                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
+                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
+                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
                         'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
                         'summary': helpers.get_xml_attr(metadata_main, 'summary'),
                         'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
@@ -498,12 +502,13 @@ class PmsConnect(object):
                         'library_title': library_title,
                         'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
                         'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
-                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
-                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
-                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
-                        'studio': show_details['metadata']['studio'],
+                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
                         'title': helpers.get_xml_attr(metadata_main, 'title'),
+                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
+                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
+                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
+                        'studio': show_details['metadata']['studio'],
                         'content_rating': show_details['metadata']['content_rating'],
                         'summary': show_details['metadata']['summary'],
                         'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
@@ -535,12 +540,12 @@ class PmsConnect(object):
                         'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
                         'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
                         'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
-                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
-                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
-                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
-                        'studio': show_details['metadata']['studio'],
                         'title': helpers.get_xml_attr(metadata_main, 'title'),
+                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
+                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
+                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
+                        'studio': show_details['metadata']['studio'],
                         'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
                         'summary': helpers.get_xml_attr(metadata_main, 'summary'),
                         'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
@@ -568,12 +573,14 @@ class PmsConnect(object):
                         'library_id': library_id,
                         'library_title': library_title,
                         'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
-                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
-                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
-                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
-                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
+                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
+                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
                         'title': helpers.get_xml_attr(metadata_main, 'title'),
+                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
+                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
+                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
+                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
                         'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
                         'summary': helpers.get_xml_attr(metadata_main, 'summary'),
                         'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
@@ -604,12 +611,13 @@ class PmsConnect(object):
                         'library_title': library_title,
                         'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
                         'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
-                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
-                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
-                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
-                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
+                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
                         'title': helpers.get_xml_attr(metadata_main, 'title'),
+                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
+                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
+                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
+                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
                         'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
                         'summary': artist_details['metadata']['summary'],
                         'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
@@ -641,12 +649,12 @@ class PmsConnect(object):
                         'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
                         'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
                         'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
-                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
-                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
-                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
-                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
                         'title': helpers.get_xml_attr(metadata_main, 'title'),
+                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
+                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
+                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
+                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
                         'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
                         'summary': helpers.get_xml_attr(metadata_main, 'summary'),
                         'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index d80a86e3..28fe3219 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -845,13 +845,14 @@ class WebInterface(object):
             return None
 
     @cherrypy.expose
-    def info(self, library_id=None, item_id=None, source=None, query=None, **kwargs):
+    def info(self, library_id=None, rating_key=None, source=None, **kwargs):
         # Make sure our library sections are up to date.
         data_factory = datafactory.DataFactory()
         data_factory.update_library_sections()
+        # temporary until I find a beter place to put this
+        #data_factory.update_library_ids()
 
         metadata = None
-        query_string = query
 
         config = {
             "pms_identifier": plexpy.CONFIG.PMS_IDENTIFIER,
@@ -860,7 +861,7 @@ class WebInterface(object):
 
         if source == 'history':
             data_factory = datafactory.DataFactory()
-            metadata = data_factory.get_metadata_details(row_id=item_id)
+            metadata = data_factory.get_metadata_details(rating_key=rating_key)
         elif library_id:
             pms_connect = pmsconnect.PmsConnect()
             result = pms_connect.get_library_metadata_details(library_id=library_id)
@@ -868,20 +869,51 @@ class WebInterface(object):
                 metadata = result['metadata']
         else:
             pms_connect = pmsconnect.PmsConnect()
-            result = pms_connect.get_metadata_details(rating_key=item_id)
+            result = pms_connect.get_metadata_details(rating_key=rating_key)
             if result:
                 metadata = result['metadata']
-            else:
-                data_factory = datafactory.DataFactory()
-                query = data_factory.get_search_query(rating_key=item_id)
-                if query_string:
-                    query['query_string'] = query_string
-
+        
         if metadata:
             return serve_template(templatename="info.html", data=metadata, title="Info", config=config)
+        else:
+            return self.update_metadata(rating_key)
+            #raise cherrypy.InternalRedirect("/update_metadata?rating_key=" + rating_key)
+
+    @cherrypy.expose
+    def update_metadata(self, rating_key=None, query=None, **kwargs):
+
+        query_string = query
+
+        data_factory = datafactory.DataFactory()
+        query = data_factory.get_search_query(rating_key=rating_key)
+        if query_string:
+            query['query_string'] = query_string
+
+        if query:
+            return serve_template(templatename="update_metadata.html", query=query, title="Info")
         else:
             logger.warn('Unable to retrieve data.')
-            return serve_template(templatename="info.html", data=None, query=query, title="Info")
+            return serve_template(templatename="update_metadata.html", query=query, title="Info")
+
+    @cherrypy.expose
+    def update_metadata_details(self, old_rating_key, new_rating_key, media_type, **kwargs):
+        data_factory = datafactory.DataFactory()
+        pms_connect = pmsconnect.PmsConnect()
+
+        if new_rating_key:
+            old_key_list = data_factory.get_rating_keys_list(rating_key=old_rating_key, media_type=media_type)
+            new_key_list = pms_connect.get_rating_keys_list(rating_key=new_rating_key, media_type=media_type)
+
+            result = data_factory.update_metadata(old_key_list=old_key_list,
+                                                  new_key_list=new_key_list,
+                                                  media_type=media_type)
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps({'message': result})
+        else:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps({'message': 'no data received'})
 
     @cherrypy.expose
     def get_user_recently_watched(self, user=None, user_id=None, limit='10', **kwargs):
@@ -1594,26 +1626,6 @@ class WebInterface(object):
         else:
             logger.warn('Unable to retrieve data.')
 
-    @cherrypy.expose
-    def get_map_rating_keys(self, old_rating_key, new_rating_key, media_type, **kwargs):
-
-        data_factory = datafactory.DataFactory()
-        pms_connect = pmsconnect.PmsConnect()
-
-        if new_rating_key:
-            old_key_list = data_factory.get_rating_keys_list(rating_key=old_rating_key, media_type=media_type)
-            new_key_list = pms_connect.get_rating_keys_list(rating_key=new_rating_key, media_type=media_type)
-
-            result = data_factory.update_rating_key(old_key_list=old_key_list,
-                                                    new_key_list=new_key_list,
-                                                    media_type=media_type)
-
-        if result:
-            cherrypy.response.headers['Content-type'] = 'application/json'
-            return json.dumps(result)
-        else:
-            logger.warn('Unable to retrieve data.')
-
     @cherrypy.expose
     def discover(self, token=''):
         """