diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html
index e81a22d7d6..cedcdb1d22 100644
--- a/dashboard-ui/edititemmetadata.html
+++ b/dashboard-ui/edititemmetadata.html
@@ -192,7 +192,7 @@
                             </div>
                             <div data-role="fieldcontain" id="fldPlayers" style="display: none;">
                                 <label for="txtPlayers">Players:</label>
-                                <input type="number" id="txtPlayers" name="txtPlayers" data-mini="true" />
+                                <input type="number" id="txtPlayers" name="txtPlayers" data-mini="true" pattern="[0-9]*" />
                             </div>
                             <div data-role="fieldcontain" id="fld3dFormat" style="display: none;">
                                 <label for="select3dFormat">3D Format:</label>
@@ -205,6 +205,36 @@
                                 </select>
                             </div>
                         </div>
+                        <div data-role="collapsible" data-mini="true" data-collapsed="false" id="collapsibleDvdEpisodeInfo" style="display: none;">
+                            <h3>Dvd Episode Info</h3>
+                            <div>
+                                <div data-role="fieldcontain">
+                                    <label for="txtDvdSeasonNumber">Dvd season number:</label>
+                                    <input type="number" id="txtDvdSeasonNumber" name="txtDvdSeasonNumber" data-mini="true" pattern="[0-9]*" />
+                                </div>
+                                <div data-role="fieldcontain">
+                                    <label for="txtDvdEpisodeNumber">Dvd episode number:</label>
+                                    <input type="number" id="txtDvdEpisodeNumber" name="txtDvdEpisodeNumber" data-mini="true" pattern="[0-9]*" />
+                                </div>
+                            </div>
+                        </div>
+                        <div data-role="collapsible" data-mini="true" data-collapsed="false" id="collapsibleSpecialEpisodeInfo" style="display: none;">
+                            <h3>Special Episode Info</h3>
+                            <div>
+                                <div data-role="fieldcontain">
+                                    <label for="txtAirsBeforeSeason">Airs before season:</label>
+                                    <input type="number" id="txtAirsBeforeSeason" name="txtAirsBeforeSeason" data-mini="true" pattern="[0-9]*" />
+                                </div>
+                                <div data-role="fieldcontain">
+                                    <label for="txtAirsAfterSeason">Airs after season:</label>
+                                    <input type="number" id="txtAirsAfterSeason" name="txtAirsAfterSeason" data-mini="true" pattern="[0-9]*" />
+                                </div>
+                                <div data-role="fieldcontain">
+                                    <label for="txtAirsBeforeEpisode">Airs before episode:</label>
+                                    <input type="number" id="txtAirsBeforeEpisode" name="txtAirsBeforeEpisode" data-mini="true" pattern="[0-9]*" />
+                                </div>
+                            </div>
+                        </div>
                         <div data-role="collapsible" data-mini="true" data-collapsed="false">
                             <h3>External Id's</h3>
                             <div>
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 2a1db0bcb3..012a35d14b 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -648,6 +648,14 @@
             $('#fldMusicBrainzReleaseGroupId', page).hide();
         }
 
+        if (item.Type == "Episode") {
+            $('#collapsibleDvdEpisodeInfo', page).show();
+            $('#collapsibleSpecialEpisodeInfo', page).show();
+        } else {
+            $('#collapsibleDvdEpisodeInfo', page).hide();
+            $('#collapsibleSpecialEpisodeInfo', page).hide();
+        }
+
         if (item.Type == "Person" || item.Type == "Genre" || item.Type == "Studio" || item.Type == "GameGenre" || item.Type == "MusicGenre" || item.Type == "Channel") {
             $('#fldCommunityRating', page).hide();
             $('#fldCommunityVoteCount', page).hide();
@@ -812,6 +820,12 @@
         $('#txtParentIndexNumber', page).val(('ParentIndexNumber' in item) ? item.ParentIndexNumber : "");
         $('#txtPlayers', page).val(item.Players || "");
 
+        $('#txtDvdEpisodeNumber', page).val(('DvdEpisodeNumber' in item) ? item.DvdEpisodeNumber : "");
+        $('#txtDvdSeasonNumber', page).val(('DvdSeasonNumber' in item) ? item.DvdSeasonNumber : "");
+        $('#txtAirsBeforeSeason', page).val(('AirsBeforeSeasonNumber' in item) ? item.AirsBeforeSeasonNumber : "");
+        $('#txtAirsAfterSeason', page).val(('AirsAfterSeasonNumber' in item) ? item.AirsAfterSeasonNumber : "");
+        $('#txtAirsEpisodeSeason', page).val(('AirsBeforeEpisodeNumber' in item) ? item.AirsBeforeEpisodeNumber : "");
+
         $('#txtAlbum', page).val(item.Album || "");
         $('#txtAlbumArtist', page).val(item.AlbumArtist || "");
 
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 2c5d41d095..1031ef0a02 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -995,7 +995,7 @@
 
             var name = item.Name;
 
-            if (displayAsSpecial && item.Type == "Episode" && item.SpecialSeasonNumber) {
+            if (displayAsSpecial && item.Type == "Episode" && item.ParentIndexNumber == 0) {
 
                 name = "Special - " + name;