diff --git a/tivomirror.py b/tivomirror.py
index bec0682..e836fd6 100755
--- a/tivomirror.py
+++ b/tivomirror.py
@@ -89,11 +89,11 @@ config = None
 class IncludeShow:
 	includes = dict()
 	
-	def __init__(self, title, short=None, unique=None):
+	def __init__(self, title, short=None, unique=True):
 		self.short = short
 		self.title = title
 		self.timestamp = False
-		self.unique = unique
+		self.unique = unique or unique == None
 		self.includes[title] = self
 
 
@@ -328,14 +328,7 @@ class TivoToc:
 		for item in self.items:
 			multiple = None
 			options = IncludeShow.includes.get(title)
-			if options:
-				if options.unique:
-					multiple = False
-			if multiple == None:
-				utf8title = title.encode("utf-8")
-				if self.uniquedb.has_key(utf8title) and self.uniquedb[utf8title] == '1':
-					multiple = True
-			if multiple:
+			if options and not options.unique:
 				item.makeNotUnique()
 		return self.items