diff --git a/templates/root/history_common.mako b/templates/root/history_common.mako
index 5126a8293c3..5eecdcfb055 100644
--- a/templates/root/history_common.mako
+++ b/templates/root/history_common.mako
@@ -61,7 +61,7 @@
                     The job creating this dataset was cancelled before completion.
                 </div>
             %elif data_state == "empty":
-                <div>${_('No data: ')}<i>${_(data.display_info())}</i></div>
+                <div>${_('No data: ')}<i>${data.display_info()}</i></div>
             %elif data_state == "ok":
                 <div>
                     ${data.blurb},
@@ -73,7 +73,7 @@
                         <span class="${data.dbkey}">${_(data.dbkey)}</span>
                     %endif
                 </div>
-                <div class="info">${_('Info: ')}${_(data.display_info())}</div>
+                <div class="info">${_('Info: ')}${data.display_info()}</div>
                 <div> 
                     %if data.has_data:
                         <a href="${h.url_for( action='display', id=data.id, tofile='yes', toext=data.ext )}" target="_blank">save</a>
diff --git a/tool-data/shared/gbrowse/gbrowse_build_sites.txt b/tool-data/shared/gbrowse/gbrowse_build_sites.txt
index 8fe4e30c481..a315928ebec 100644
--- a/tool-data/shared/gbrowse/gbrowse_build_sites.txt
+++ b/tool-data/shared/gbrowse/gbrowse_build_sites.txt
@@ -1,3 +1,3 @@
-#Harvested from http://www.wormbase.org/db/seq/gbrowse/wormbase/
-main	http://www.wormbase.org/db/seq/gbrowse/c_elegans/	b_malayi,c_brenneri,c_briggsae_cb25,c_briggsae,c_elegans
-test	http://dev.wormbase.org/db/seq/gbrowse/c_elegans/	b_malayi,c_brenneri,c_briggsae_cb25,c_briggsae,c_elegans
+# wormbase sites / supported genomes
+main	http://www.wormbase.org/db/seq/gbgff/c_elegans/    c_elegans,c_briggsae,c_remanei,c_brenneri,c_japonica,p_pristionchus,b_malayi
+test    http://dev.wormbase.org/db/seq/gbrowse/c_elegans/    c_elegans,c_briggsae,c_remanei,c_brenneri,c_japonica,p_pristionchus,b_malayi
diff --git a/tools/data_source/wormbase.xml b/tools/data_source/wormbase.xml
index 74cccb30bf6..ef7d55b70bb 100644
--- a/tools/data_source/wormbase.xml
+++ b/tools/data_source/wormbase.xml
@@ -2,7 +2,7 @@
 <tool name="Wormbase" id="wormbase" tool_type="data_source" URL_method="post">
     <description>server</description>
     <command interpreter="python">data_source.py $output</command>
-    <inputs action="http://www.wormbase.org/db/seq/gbrowse/c_elegans/" check_values="false" target="_top"> 
+    <inputs action="http://www.wormbase.org/db/seq/gbgff/c_elegans/" check_values="false" target="_top"> 
         <display>go to Wormbase server $GALAXY_URL</display>
         <param name="GALAXY_URL" type="baseurl" value="/tool_runner?tool_id=wormbase" />
     </inputs>