diff --git a/NzbDrone.Web/Scripts/NzbDrone/grid.js b/NzbDrone.Web/Scripts/NzbDrone/grid.js
index 95811fc46..c4974b190 100644
--- a/NzbDrone.Web/Scripts/NzbDrone/grid.js
+++ b/NzbDrone.Web/Scripts/NzbDrone/grid.js
@@ -71,7 +71,7 @@ $(function () {
     // Declare a function on the chat hub so the server can invoke it
     signalRProvider.updatedStatus = function (data) {
         var imageSrc = '../../Content/Images/' + data.EpisodeStatus + '.png';
-        var row = $('tr.episodeId_' + data.EpisodeId);
+        var row = $('[data-episode-id="' + data.EpisodeId + '"]');
 
         if (row.length == 0)
             return;
diff --git a/NzbDrone.Web/Views/Series/Episode.cshtml b/NzbDrone.Web/Views/Series/Episode.cshtml
index bd5d59fa4..fac8a3efb 100644
--- a/NzbDrone.Web/Views/Series/Episode.cshtml
+++ b/NzbDrone.Web/Views/Series/Episode.cshtml
@@ -2,7 +2,7 @@
 @using NzbDrone.Web.Helpers
 @model NzbDrone.Web.Models.EpisodeModel
 
-<tr class="episodeId_@(Model.EpisodeId) data-row@(ViewData["AltRow"] == null || !(bool)ViewData["AltRow"] ? "" : " alt-row")" data-episodefileid="@Model.EpisodeFileId">
+<tr class="data-row@(ViewData["AltRow"] == null || !(bool)ViewData["AltRow"] ? "" : " alt-row")" data-episodefileid="@Model.EpisodeFileId" data-episode-id="@Model.EpisodeId">
     <td>@Model.EpisodeNumber</td>
     <td>@Model.Title</td>
     <td>@Model.AirDate</td>
diff --git a/NzbDrone.Web/Views/Series/Index.cshtml b/NzbDrone.Web/Views/Series/Index.cshtml
index 51926e53b..f23ea4ae2 100644
--- a/NzbDrone.Web/Views/Series/Index.cshtml
+++ b/NzbDrone.Web/Views/Series/Index.cshtml
@@ -194,7 +194,7 @@
                             ],
                 "aaSorting": [[1, 'asc']],
                 "fnCreatedRow": function( nRow, aData, iDataIndex ) {
-                    $(nRow).addClass(aData["SeriesId"].toString());
+                    $(nRow).attr('data-series-id', aData["SeriesId"].toString());
                 },
                 "fnRowCallback": function (nRow, aData, iDisplayIndex, iDisplayIndexFull) {
                     var element = $(nRow).find('.progressBar');
@@ -214,7 +214,7 @@
         
         //After we delete a series do this...
         function afterDelete(seriesId) {
-            var row = $('.' + seriesId);
+            var row = $('[data-series-id="' + seriesId + '"]');
             
             if ($(row).hasClass('details-opened')) {
                 var nextRow = $(row).next('tr');
diff --git a/NzbDrone.Web/Views/Upcoming/UpcomingEpisode.cshtml b/NzbDrone.Web/Views/Upcoming/UpcomingEpisode.cshtml
index 5b113280a..e0ecd1366 100644
--- a/NzbDrone.Web/Views/Upcoming/UpcomingEpisode.cshtml
+++ b/NzbDrone.Web/Views/Upcoming/UpcomingEpisode.cshtml
@@ -7,7 +7,7 @@
     Layout = null;
 }
 
-<tr class='episodeId_@(Model.EpisodeId) data-row@(ViewData["AltRow"] == null || !(bool)ViewData["AltRow"] ? "" : " alt-row")'>
+<tr class="data-row@(ViewData["AltRow"] == null || !(bool)ViewData["AltRow"] ? "" : " alt-row")" data-episode-id="@Model.EpisodeId">
     <td>@Html.ActionLink(Model.SeriesTitle, "Details", "Series", new { seriesId = Model.SeriesId }, null)</td>
     <td>@Model.EpisodeNumbering</td>
     <td>@Model.Title</td>