diff --git a/views/charity.html b/views/charity.html
index f95c73cd..92a8f64e 100644
--- a/views/charity.html
+++ b/views/charity.html
@@ -39,7 +39,7 @@
               % for co in charity["company_number"]:
               <tr>
                 <td>
-                  <a href="https://beta.companieshouse.gov.uk/company/{{ co["number"] }}" target="_blank">
+                  <a href="https://beta.companieshouse.gov.uk/company/{{ co['number'] }}" target="_blank">
                     {{ co["number"] }}
                   </a>
                   <i>(Source: {{ sources.get(co["source"], co["source"])}})</i>
@@ -60,22 +60,22 @@
         <div class="content">
           <ul>
             % if charity.get("url"):
-            <li><a href="{{ charity["url"] }}" target="_blank">Charity website</a></li>
+            <li><a href="{{ charity['url'] }}" target="_blank">Charity website</a></li>
             % end
             % if charity["ccew_number"]:
-            <li><a href="http://apps.charitycommission.gov.uk/Showcharity/RegisterOfCharities/SearchResultHandler.aspx?RegisteredCharityNumber={{charity["ccew_number"]}}&SubsidiaryNumber=0&Ref=CO" target="_blank">Charity Commission England and Wales</a></li>
-            <li><a href="http://beta.charitycommission.gov.uk/charity-details/?regid={{charity["ccew_number"]}}&subid=0" target="_blank">Charity Commission England and Wales (beta)</a></li>
-            <li><a href="https://charitybase.uk/api/v0.2.0/charities?subNumber=0&charityNumber={{charity["ccew_number"]}}" target="_blank">CharityBase [JSON]</a></li>
-            <li><a href="http://opencharities.org/charities/{{charity["ccew_number"]}}" target="_blank">OpenCharities</a></li>
-            <li><a href="http://www.guidestar.org.uk/summary.aspx?CCReg={{charity["ccew_number"]}}" target="_blank">GuideStar</a></li>
-            <li><a href="http://www.charitychoice.co.uk/charities/search?t=qsearch&q={{charity["ccew_number"]}}" target="_blank">Charities Direct</a></li>
-            <li><a href="https://olib.uk/charity/html/{{charity["ccew_number"]}}" target="_blank">CharityData by Olly Benson</a></li>
+            <li><a href="http://apps.charitycommission.gov.uk/Showcharity/RegisterOfCharities/SearchResultHandler.aspx?RegisteredCharityNumber={{charity['ccew_number']}}&SubsidiaryNumber=0&Ref=CO" target="_blank">Charity Commission England and Wales</a></li>
+            <li><a href="http://beta.charitycommission.gov.uk/charity-details/?regid={{charity['ccew_number']}}&subid=0" target="_blank">Charity Commission England and Wales (beta)</a></li>
+            <li><a href="https://charitybase.uk/charities/{{charity['ccew_number']}}" target="_blank">CharityBase</a></li>
+            <li><a href="http://opencharities.org/charities/{{charity['ccew_number']}}" target="_blank">OpenCharities</a></li>
+            <li><a href="http://www.guidestar.org.uk/summary.aspx?CCReg={{charity['ccew_number']}}" target="_blank">GuideStar</a></li>
+            <li><a href="http://www.charitychoice.co.uk/charities/search?t=qsearch&q={{charity['ccew_number']}}" target="_blank">Charities Direct</a></li>
+            <li><a href="https://olib.uk/charity/html/{{charity['ccew_number']}}" target="_blank">CharityData by Olly Benson</a></li>
             % end
             % if charity["ccni_number"]:
-            <li><a href="http://www.charitycommissionni.org.uk/charity-details/?regid={{charity["ccni_number"].replace("NIC", "")}}&subid=0" target="_blank">Charity Commission Northern Ireland</a></li>
+            <li><a href="http://www.charitycommissionni.org.uk/charity-details/?regid={{charity['ccni_number'].replace('NIC', '')}}&subid=0" target="_blank">Charity Commission Northern Ireland</a></li>
             % end
             % if charity["oscr_number"]:
-            <li><a href="https://www.oscr.org.uk/about-charities/search-the-register/charity-details?number={{charity["oscr_number"]}}" target="_blank">Office of the Scottish Charity Register</a></li>
+            <li><a href="https://www.oscr.org.uk/about-charities/search-the-register/charity-details?number={{charity['oscr_number']}}" target="_blank">Office of the Scottish Charity Register</a></li>
             % end
           </ul>
         </div>
@@ -95,7 +95,7 @@
                 <th>CCEW Charity number</th>
                 <td>
                   % if charity["ccew_number"]:
-                  <a href={{ charity["ccew_link"]}}>{{ charity["ccew_number"] }}</a>
+                  <a href="http://beta.charitycommission.gov.uk/charity-details/?regid={{charity['ccew_number']}}&subid=0" target="_blank">{{ charity["ccew_number"] }}</a>
                   % else:
                   None
                   % end
@@ -105,7 +105,7 @@
                 <th>OSCR Charity number</th>
                 <td>
                   % if charity["oscr_number"]:
-                  <a href={{ charity["oscr_link"]}}>{{ charity["oscr_number"] }}</a>
+                  <a href="https://www.oscr.org.uk/about-charities/search-the-register/charity-details?number={{charity['oscr_number']}}" target="_blank">{{ charity["oscr_number"] }}</a>
                   % else:
                   None
                   % end
@@ -115,7 +115,7 @@
                 <th>CCNI Charity number</th>
                 <td>
                   % if charity["ccni_number"]:
-                  <a href={{ charity["ccni_link"]}}>{{ charity["ccni_number"] }}</a>
+                  <a href="http://www.charitycommissionni.org.uk/charity-details/?regid={{charity['ccni_number'].replace('NIC', '')}}&subid=0" target="_blank">{{ charity["ccni_number"] }}</a>
                   % else:
                   None
                   % end
@@ -148,7 +148,7 @@
               </tr>
               <tr>
                 <th>Website</th>
-                <td><a href="{{ charity["url"] }}">{{ charity["url"] }}</a></td>
+                <td><a href="{{ charity['url'] }}">{{ charity["url"] }}</a></td>
               </tr>
               <tr>
                 <th>Domain</th>
diff --git a/views/preview.html b/views/preview.html
index ec900e98..cee0945f 100644
--- a/views/preview.html
+++ b/views/preview.html
@@ -25,26 +25,26 @@ <h5><strong>Charity Number</strong></h5>
         % if charity["ccew_number"]:
         <li>
           <strong>England and Wales (CCEW):</strong>
-            <a href="{{ charity[ "ccew_link"]}}" target="_blank">{{ charity["ccew_number"] }}</a>
+            <a href="http://beta.charitycommission.gov.uk/charity-details/?regid={{charity['ccew_number']}}&subid=0" target="_blank">{{ charity["ccew_number"] }}</a>
         </li>
         % end
         % if charity["oscr_number"]:
         <li>
           <strong>Scotland (OSCR):</strong>
-            <a href="{{ charity[ "oscr_link"]}}" target="_blank">{{ charity["oscr_number"] }}</a>
+            <a href="https://www.oscr.org.uk/about-charities/search-the-register/charity-details?number={{charity['oscr_number']}}" target="_blank">{{ charity["oscr_number"] }}</a>
         </li>
         % end
         % if charity["ccni_number"]:
         <li>
           <strong>Northern Ireland (CCNI):</strong>
-            <a href="{{ charity["ccni_link"]}}" target="_blank">{{ charity["ccni_number"] }}</a>
+            <a href="http://www.charitycommissionni.org.uk/charity-details/?regid={{charity['ccni_number'].replace('NIC', '')}}&subid=0" target="_blank">{{ charity["ccni_number"] }}</a>
         </li>
         % end
       </ul>
       <h5><strong>Company Number:</strong>
         % if charity["company_number"]:
           % for co in charity["company_number"]:
-            <a href="https://beta.companieshouse.gov.uk/company/{{ co["number"] }}" target="_blank">
+            <a href="https://beta.companieshouse.gov.uk/company/{{ co['number'] }}" target="_blank">
               {{ co["number"] }}
             </a>
              ({{co["source"]}})