diff --git a/mysecrets.py b/mysecrets.py
index add4314..c91ed6a 100755
--- a/mysecrets.py
+++ b/mysecrets.py
@@ -69,10 +69,17 @@ def mkpass(size=10):
   return string.join([random.choice(validChars) for x in range(size)],"")
 
 def get_pair_from_url(domain):
-  return db.select('passwords', where='base_url LIKE "%'+domain+'%"', order='id DESC')
+  a = db.select('passwords', where='base_url LIKE "%'+domain+'%"', order='id DESC')
 
+  if not len(a) > 0:
+    a = db.select('passwords', where='base_url LIKE "%'+get_domain(domain)+'%"', 
+      order='id DESC')
+    
+  return a
+    
 def get_generated_from_url(domain):
-  gen = db.select('generated', where='base_url LIKE "%'+domain+'%"', order='id DESC')
+  gen = db.select('generated', where='base_url LIKE "%'+get_domain(domain)+'%"', 
+    order='id DESC')
 
   while not len(gen) > 0:
     db.insert('generated', base_url = domain, password = mkpass())
@@ -106,12 +113,12 @@ class index:
 
       body = []      
 
-      domain = get_domain(i.base_url)
+      domain = i.base_url
 
       body.append('<h1>'+domain+'</h1>\n')
 
-      selected = get_pair_from_url(domain)
-      generated = get_generated_from_url(domain)
+      selected = get_pair_from_url(i.base_url)
+      generated = get_generated_from_url(i.base_url)
 
       if selected:
         body.append('<h2>Existing:</h2>\n<ul>')