diff --git a/modules/bibformat/etc/format_templates/HD_EPFL_default.bft b/modules/bibformat/etc/format_templates/HD_EPFL_default.bft
index a9c4430cb..c01925eef 100644
--- a/modules/bibformat/etc/format_templates/HD_EPFL_default.bft
+++ b/modules/bibformat/etc/format_templates/HD_EPFL_default.bft
@@ -1,92 +1,90 @@
 <name>EPFL HTML detailed - default</name>
 <description>Detailed format for article, review</description>
         <div id="tools">
           <!--<div class="button copy" stye="display: none;">
             <a href="/search?ln=<lang><en>en</en><fr>fr</fr></lang>&amp;p=recid%3A<BFE_RECID />&amp;rm=wrd">
               <button class="icon"></button>
               <span class="label"><lang><en>Similar records</en><fr>Notices similaires</fr></lang></span>
             </a>
           </div>-->
           
           <div class="button file" style="display: none">
             <div id="tooltip_trigger">
               <a href="" id="convert_records">
                 <button class="icon"></button>
                 <span class="label"><lang><en>Export</en><fr>Exporter</fr></span>
               </a>
             </div>
             <div class="tooltip bottom">
               <ul id="convert_formats">
                 <li><a href="/curator/convert/bibtex">BibTeX</a></li>
                 <li><a href="/curator/convert/dublincore">Dublin Core XML</a></li>
                 <li><a href="/curator/convert/ris">RIS (RefMan, EndNote)</a></li>
                 <li><a href="/curator/convert/marcxml">MARC XML</a></li>
               </ul>
             </div>
             <div class="clear"></div>
             <form id="infoscience-searchform" action="/curator/convert/marcxml" style="display: none">
               <input type="hidden" name="p" value="recid:<BFE_RECORD_ID />" />
               <input type="hidden" name="filename" value="<BFE_FIELD tag='037__a' />" />
             </form>
           </div>
           
         </div>
         <div id="content" class="content">
           <div class="left-col">
             <div class="doctype local-color"><BFE_DOCTYPE /></div>
             <BFE_EPFL_ICON />
           </div>
           <div class="record-container" id="record-container-<BFE_RECORD_ID />">
             <h1 class="h2"><BFE_TITLE prefix='' suffix="" latex_to_html="yes" /></h1>
             <div class="authors"><BFE_AUTHORS print_links="yes" limit="10" interactive="yes" extension="et al." separator="; "/></div>
             <ul class="record-metadata">
               <BFE_CONFERENCE prefix='<li><span class="field-label"><lang><en>Presented at:</en><fr>Présenté à:</fr></lang></span> ' suffix="</li>"/>
               <BFE_HOST prefix="<li>" display_label="yes" display_identifiers="yes" label_with_span="yes" />
               <BFE_SERIES_INTEXT prefix='<li><span class="field-label"><lang><en>Series:</en><fr>Série:</fr></lang></span> ' suffix="</li>" />
               <BFE_IMPRINT prefix='<li>' suffix="</li>" />
             </ul>
             <BFE_ABSTRACT prefix="<p>" suffix="</p>" latex_to_html="yes"  print_lang="en" />
             
             <BFE_KEYWORDS prefix='<p><span class="field-label"><lang><en>Keywords:</en><fr>Mots-clefs:</fr></lang></span> ' suffix="</p>" keyword_prefix="" keyword_suffix="" />
             <BFE_THESIS_INFO />
             <BFE_DEFENSE prefix='<p><lang><en>Public defense:</en><fr>Soutenance:</fr></lang> ' suffix="</p>" />
 
             <BFE_AWARD prefix='<p>' suffix="</p>" />
             <BFE_NOTE prefix='<p><span class="field-label">Note:</span> ' suffix="</p>" />
-            <ul class="record-metadata">
-            	<BFE_PATENT />
-            </ul>
+            
             <h4><lang><en>Reference</en><fr>Référence</fr></lang></h4>
             <ul>
               <BFE_REFERENCES />
             </ul>
             <BFE_EPFL_FULLTEXT style="url_list" display_fulltext="no" display_url="yes" display_replacement_text="no" />
             
             <p class="notice_date"><BFE_UPDATED_DATE /></p>
             <BFE_EDIT_RECORD />
           </div>
         </div>
         <div class="right-col">
           <div class="box overhead">
             <h3><lang><en>Fulltext</en><fr>Fulltext</fr></lang></h3>
             <BFE_EPFL_FULLTEXT style="fulltext_list" />
           </div>
            <div class="box">
             <h3><lang><en>Related material</en><fr>Documents pertinents</fr></lang><a href="http://ellearn.com/?id=<BFE_RECORD_ID />&type=pub&source=EPFL" target="_new"><span style="float: right; width:30px;height:30px"></span></a></h3>
             <ul class="link-list" style="margin-bottom: 20px;">
               <li><a href="/search?ln=<lang><en>en</en><fr>fr</fr></lang>&amp;p=recid%3A<BFE_RECID />&amp;rm=wrd">
                   <lang><en>Similar EPFL publications</en><fr>Publications EPFL similaires</fr></lang></span></a>
               </li>
               <!--<li><img src="/media/img/logothem.png" style="vertical-align:-5px; margin-top:5px;" /> <a href="http://ellearn.com/?id=<BFE_RECORD_ID />&type=pub&source=EPFL" target="_new"> <lang><en>Similar courses, documents and services</en><fr>Cours, documents et services similaires</fr></lang></a>
             -->
             </ul>
           </div>
 
           <div class="box">
             <h3><lang><en>Contacts</en><fr>Contacts</fr></lang></h3>
             <ul class="link-list" style="margin-bottom: 20px;"><BFE_CONTACT_LAB kb_name="lab_name" kb_url="lab_url" /></ul>
             <BFE_CONTACT_AUTHORS prefix='<h4><lang><en>EPFL authors</en><fr>Auteurs EPFL</fr></lang></h4><ul class="link-list">' suffix='</ul>'  />
           </div>
         </div>
         <div class="clear"></div>
 
diff --git a/modules/bibformat/lib/elements/bfe_patent.py b/modules/bibformat/lib/elements/bfe_patent.py
index 5e55aa96a..130cb166f 100644
--- a/modules/bibformat/lib/elements/bfe_patent.py
+++ b/modules/bibformat/lib/elements/bfe_patent.py
@@ -1,64 +1,66 @@
 # -*- coding: utf-8 -*-
 """BibFormat element - Prints Patent Number"""
 
 
 def format(bfo, short="no"):
     """
     Print Patent information.
 
     """
     # don't show anything at the moment on html brief
     # it may a good idea to put an information like "published or granted" like :
     # if b1:
     #  return "Granted/Published patent"
     # if a1:
     #  return "Pending patent"
     if short != "no":
         return ""
     
     patents = bfo.fields('013')
     
-    template_output_patent_nr = '<li><span class="field-label">Patent :</span><ul>%s</ul></li>'
+    template_output_patent_nr = '<li><span class="field-label">Patent :</span><ul class="record-metadata">%s</ul></li>'
     
     output = []
     # get number with data linked
     patents_nr = []
     patent_priority_dates = []
     
     # parse
     if patents:
         outer_list = "<ul>%s</u>"
         for patent in patents:
             if patent.has_key('a'):
-                patent_output = patent['a'] 
+                patent_output = ''
+                
+                # add country
+                if patent.has_key('b'):
+                    patent_output += patent['b']
+                
+                patent_output += patent['a'] 
                 
                 # add type of number
                 if patent.has_key('c'):
                     patent_output += ' (' + patent['c'] + ')'
                     
-                # add country
-                if patent.has_key('b'):
-                    patent_output += ' (' + patent['b'] + ')'
-                    
                 patents_nr.append(patent_output)
                 
                 # prority_dates are not shown, but are the same year as the publication date
                 # if patent.has_key('d'):
                 #    patent_priority_dates.append(patent['d'])
     
     # format
     if patents_nr:
         output_patent_nr = []
         for patent_nr in patents_nr:
             output_patent_nr.append("<li>%s</li>" % patent_nr)
 
         output.append(template_output_patent_nr % "".join(output_patent_nr))
         
     return outer_list % "".join(output)
     
 def escape_values(bfo):
     """
     Called by BibFormat in order to check if output of this element
     should be escaped.
     """
     return 0
\ No newline at end of file
diff --git a/modules/bibformat/lib/elements/bfe_references.py b/modules/bibformat/lib/elements/bfe_references.py
index a934c8e86..540d18a57 100644
--- a/modules/bibformat/lib/elements/bfe_references.py
+++ b/modules/bibformat/lib/elements/bfe_references.py
@@ -1,67 +1,69 @@
 # -*- coding: utf-8 -*-
 """BibFormat element - Prints references"""
 import re
 
 from invenio.messages import gettext_set_language
 
 
 def format(bfo):
     """
     Print host (Order: Name of publisher, place of publication and date of publication).
 
     """
     _ = gettext_set_language(bfo.lang)
     output = []
     epflid = bfo.field('037__a').strip()
     if epflid:
         output.append(epflid)
     
     doi = bfo.field('0247_a').strip()
     if doi:
         doi_re = re.compile(r'(10.(\d)+/(\S)+)')
         if doi_re.search(doi):
             output.append('<a href="http://dx.doi.org/%s">doi:%s</a>' % (doi, doi))
             
     # show patent search ?
-    if bfo.field('013__a') and bfo.field('013__b'):
+    if bfo.field('013__a'):
+        bfo.field('013__b')
+        patent_to_search = bfo.field('013__a')
         url = "http://worldwide.espacenet.com/searchResults?compact=false&PN=%s&ST=advanced&locale=en_EP&DB=EPODOC" % (str(bfo.field('013__b')) + str(bfo.field('013__a')))
-        output.append('<a href="%s">%s</a>' % (url, _("Search this record in European Patent Office")))
+        output.append('<a href="%s" target="_blank">%s</a>' % (url, _("Search this record in European Patent Office")))
     
     external = bfo.fields('035__a')
     control_nb_re = re.compile(r'(?P<id>[\w:_,.\-_/]+)\s*\((?P<cataloger>[a-z\s]+)\)', re.I)
     for ext in external:
         match = control_nb_re.match(ext)
         if match:
             extra_id = match.group('id')
             cataloger = match.group('cataloger')
         if cataloger == 'ISI':
             url = 'http://ws.isiknowledge.com/cps/openurl/service?url_ver=Z39.88-2004&amp;rft_id=info:ut/%s' % extra_id
             output.append('<a href="%s">%s</a>' % (url, _("View record in Web of Science")))
         elif cataloger == 'Scopus':
             url = 'http://www.scopus.com/scopus/openurl/link.url?ctx_ver=Z39.88-2004&amp;rfr_id=http://infoscience.epfl.ch&amp;rft_id=info:eid/%s' % extra_id
             output.append('<a href="%s">%s</a>' % (url, _("View record in Scopus")))
         elif cataloger == 'PMID':
             url = 'http://www.ncbi.nlm.nih.gov/sites/entrez?cmd=Retrieve&db=PubMed&list_uids=%s&dopt=Abstract' % extra_id
             output.append('<a href="%s">%s</a>' % (url, _("View record in PubMed")))
         elif cataloger == 'arXiv':
             url = 'http://www.arxiv.org/openurl-resolver?rft_id=%s&amp;url_ver=Z39.88-2004' % extra_id
             output.append('<a href="%s">%s</a>' % (url, _("View record in arXiv")))
         elif cataloger == 'EV':
             pass
         elif cataloger == 'SzZuIDS NEBIS':
             if bfo.lang == 'fr':
                 url = 'http://library.epfl.ch/nebis-redir/?record=%s' % extra_id
             else:
                 url = 'http://library.epfl.ch/en/nebis-redir/?record=%s' % extra_id
             
             output.append('<a href="%s">%s</a>' % (url, _("Print copy in library catalog")))
         
         
     return ''.join(['<li>%s</li>' % elem for elem in output])
 
 def escape_values(bfo):
     """
     Called by BibFormat in order to check if output of this element
     should be escaped.
     """
     return 0
\ No newline at end of file