diff --git a/lib/subliminal/services/addic7ed.py b/lib/subliminal/services/addic7ed.py
index 1080cb479830a298b0328ca696dcfde1ea5a6894..2e2005fe2a60eef9fb789dbe0d74478a461bf44d 100644
--- a/lib/subliminal/services/addic7ed.py
+++ b/lib/subliminal/services/addic7ed.py
@@ -64,6 +64,21 @@ class Addic7ed(ServiceBase):
         return self.query(video.path or video.release, languages, get_keywords(video.guess), video.series, video.season, video.episode)
 
     def query(self, filepath, languages, keywords, series, season, episode):
+
+        REMOTE_DBG = True
+        
+        if REMOTE_DBG:
+                # Make pydev debugger works for auto reload.
+                # Note pydevd module need to be copied in XBMC\system\python\Lib\pysrc
+            try:
+                import pysrc.pydevd as pydevd
+                # stdoutToServer and stderrToServer redirect stdout and stderr to eclipse console
+                pydevd.settrace('localhost', port=5678, stdoutToServer=True, stderrToServer=True)
+            except ImportError:
+                sys.stderr.write("Error: " +
+                        "You must add org.python.pydev.debug.pysrc to your PYTHONPATH.")
+                sys.exit(1) 
+        
         logger.debug(u'Getting subtitles for %s season %d episode %d with languages %r' % (series, season, episode, languages))
         self.init_cache()
         try:
diff --git a/sickbeard/common.py b/sickbeard/common.py
index 90dccb8b12fae0f1fcf28ee1972fd322fad60b78..9a9c5846e084618f2d6d2dbe780f38fc8bea7555 100644
--- a/sickbeard/common.py
+++ b/sickbeard/common.py
@@ -206,7 +206,7 @@ class Quality:
             return Quality.SDDVD
         elif checkName(["720p", "hdtv", "x264"], all) or checkName(["hr.ws.pdtv.x264"], any) and not checkName(["(1080)[pi]"], all):          
             return Quality.HDTV                                                                        
-        elif checkName(["720p|1080i", "hdtv", "mpeg2"], all):
+        elif checkName(["720p|1080i", "hdtv", "mpeg-?2"], all):
             return Quality.RAWHDTV                                                                     
         elif checkName(["1080p", "hdtv", "x264"], all):         
             return Quality.FULLHDTV