diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index bd905036..05ec3541 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -603,7 +603,11 @@ Map the tuple self.gametype onto the pokerstars string describing it
             return gs + timestr
 
     def writeTableLine(self):
-        table_string = "Table \'%s\' %s-max" % (self.tablename, self.maxseats)
+        table_string = "Table "
+        if self.gametype['type'] == 'tour':
+            table_string = table_string + "\'%s %s\' %s-max" % (self.tourNo, self.tablename, self.maxseats)
+        else:
+            table_string = table_string + "\'%s\' %s-max" % (self.tablename, self.maxseats)
         if self.gametype['currency'] == 'play':
             table_string = table_string + " (Play Money)"
         if self.buttonpos != None and self.buttonpos != 0:
diff --git a/pyfpdb/Tables.py b/pyfpdb/Tables.py
index d9efff6a..e725d5b8 100755
--- a/pyfpdb/Tables.py
+++ b/pyfpdb/Tables.py
@@ -257,6 +257,10 @@ def discover_nt_tournament(c, tour_number, tab_number):
     titles ={}
     win32gui.EnumWindows(win_enum_handler, titles)
     for hwnd in titles:
+        if 'Chat:' in titles[hwnd]: continue # Some sites (FTP? PS? Others?) have seperable or seperately constructed chat windows
+        if 'History for table:' in titles[hwnd]: continue # Everleaf Network HH viewer window
+        if 'HUD:' in titles[hwnd]: continue # FPDB HUD window
+
         if re.search(search_string, titles[hwnd]):
             return decode_windows(c, titles[hwnd], hwnd)
     return None