diff --git a/primerserver2/core/analysis_blast.py b/primerserver2/core/analysis_blast.py
index b0cb08e..1799f2f 100644
--- a/primerserver2/core/analysis_blast.py
+++ b/primerserver2/core/analysis_blast.py
@@ -113,6 +113,8 @@ def filter_Tm(amplicons, query_primer_seq, hits_seqs, Tm_diff=20, max_amplicons=
     for primer_id in amplicons.keys():
         amplicons_filter[primer_id] = {}
         for primer_rank in amplicons[primer_id]:
+            if primer_rank not in amplicons_filter[primer_id]:
+                amplicons_filter[primer_id][primer_rank] = []
             for amplicon in amplicons[primer_id][primer_rank]:
                 # hit seqs (template)
                 region_plus = amplicon['plus']['sseqid']+':'+str(amplicon['plus']['sstart'])+'-'+str(amplicon['plus']['send'])
@@ -172,13 +174,10 @@ def filter_Tm(amplicons, query_primer_seq, hits_seqs, Tm_diff=20, max_amplicons=
                     +'-'+str(amplicon['minus']['send'])
                 amplicon['product_size'] = amplicon['minus']['send']-amplicon['plus']['sstart']+1
                 amplicon['product_seq'] = ''
-                if primer_rank not in amplicons_filter[primer_id]:
-                    amplicons_filter[primer_id][primer_rank] = []
                 amplicons_filter[primer_id][primer_rank].append(amplicon)
 
                 if len(amplicons_filter[primer_id][primer_rank])==max_amplicons:
                     break
-
     return amplicons_filter
 
 def add_amplicon_seq(amplicons, template_file):
diff --git a/primerserver2/core/version.py b/primerserver2/core/version.py
index 33b5302..e0af211 100644
--- a/primerserver2/core/version.py
+++ b/primerserver2/core/version.py
@@ -1,2 +1,2 @@
 def get():
-    return '2.0.0b10'
\ No newline at end of file
+    return '2.0.0b11'
\ No newline at end of file
diff --git a/primerserver2/web/static/js/generate_html_result.js b/primerserver2/web/static/js/generate_html_result.js
index 2b7c99e..e1e89df 100644
--- a/primerserver2/web/static/js/generate_html_result.js
+++ b/primerserver2/web/static/js/generate_html_result.js
@@ -122,7 +122,7 @@ function generate_html_result(selected_dbs, db_name_change, data, visualize_mode
                     // $('#primers-result-template-primer .amplicons_table').addClass('hidden');
                     continue;
                 }
-                db_desc = db_name_change[db]
+                db_desc = db in db_name_change ? db_name_change[db] : db
                 if (db_rank==0) {
                     $('#primers-result-template-primer .database-list').append('<th>Database: '
                         +db_desc+' <span class="glyphicon glyphicon-star"></span></th>')