diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index cc091c97f..6f3ddf844 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at github@zimmermanzimmerman.nl. All
+reported by contacting the project team at info@zimmerman.team. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.
diff --git a/OIPA/OIPA/settings.py b/OIPA/OIPA/settings.py
index 77e18883c..64a7cafba 100644
--- a/OIPA/OIPA/settings.py
+++ b/OIPA/OIPA/settings.py
@@ -387,6 +387,10 @@ def rel(*x):
         'task': 'iati.PostmanJsonImport.tasks.get_postman_api',
         'schedule': crontab(minute=0, hour=0),
     },
+    'Update the exchange rates': {
+        'task': 'task_queue.tasks.update_exchange_rates',
+        'schedule': crontab(minute=0, hour=0),
+    },
 }
 
 SOLR = {
@@ -430,6 +434,9 @@ def rel(*x):
     }
 }
 
+# To be overwritten by local_settings.py in any case for security purposes.
+POSTMAN_API_KEY = 'OverwriteFromLocalSettings'
+
 try:
     from .local_settings import *  # noqa: F401, F403
 except ImportError:
diff --git a/OIPA/api/activity/tests/test_save_serializers.py b/OIPA/api/activity/tests/test_save_serializers.py
index 199d2c0c3..c368f0952 100644
--- a/OIPA/api/activity/tests/test_save_serializers.py
+++ b/OIPA/api/activity/tests/test_save_serializers.py
@@ -772,7 +772,7 @@ def test_create_contact_info(self):
             },
             "telephone": "0631942897",
             "email": "test@zz.com",
-            "website": "https://zimmermanzimmerman.com",
+            "website": "https://zimmerman.team",
             "mailing_address": {
                 "narratives": [
                     {
@@ -906,7 +906,7 @@ def test_update_contact_info(self):
             },
             "telephone": "0631942897",
             "email": "test@zz.com",
-            "website": "https://zimmermanzimmerman.com",
+            "website": "https://zimmerman.team",
             "mailing_address": {
                 "narratives": [
                     {
@@ -1424,7 +1424,7 @@ def test_create_location(self):
                     "latitude": "31.616944",
                     "longitude": "65.716944",
                 },
-                "srsName": "http://www.opengis.net/def/crs/EPSG/0/4326",
+                "srsName": "https://www.opengis.net/def/crs/EPSG/0/4326",
             },
             "exactness": {
                 "code": exactness.code,
@@ -1566,7 +1566,7 @@ def test_update_location(self):
                     "latitude": "31.616944",
                     "longitude": "65.716944",
                 },
-                "srsName": "http://www.opengis.net/def/crs/EPSG/0/4326",
+                "srsName": "https://www.opengis.net/def/crs/EPSG/0/4326",
             },
             "exactness": {
                 "code": exactness.code,
@@ -1692,7 +1692,7 @@ def test_create_humanitarian_scope(self):
                 "code": vocabulary.code,
                 "name": 'irrelevant',
             },
-            "vocabulary_uri": "https://github.com/zimmerman-zimmerman",
+            "vocabulary_uri": "https://github.com/zimmerman-team",
         }
 
         res = self.c.post(
@@ -1729,7 +1729,7 @@ def test_update_humanitarian_scope(self):
                 "code": vocabulary.code,
                 "name": 'irrelevant',
             },
-            "vocabulary_uri": "https://github.com/zimmerman-zimmerman",
+            "vocabulary_uri": "https://github.com/zimmerman-team",
         }
 
         res = self.c.put(
diff --git a/OIPA/api/generics/serializers.py b/OIPA/api/generics/serializers.py
index 03e8a2184..ff01562f9 100644
--- a/OIPA/api/generics/serializers.py
+++ b/OIPA/api/generics/serializers.py
@@ -61,7 +61,7 @@ class FilteredListSerializer(serializers.ListSerializer):
 
     def __init__(cls, *args, **kwargs):
         cls.filter_class = kwargs.pop('filter_class', ())
-        return super(FilteredListSerializer, cls).__init__(*args, **kwargs)
+        return None
 
     def to_representation(self, queryset):
         request = self.context.get("request")
diff --git a/OIPA/api/iati/references.py b/OIPA/api/iati/references.py
index ad58b3436..1355f80b2 100644
--- a/OIPA/api/iati/references.py
+++ b/OIPA/api/iati/references.py
@@ -505,10 +505,10 @@ class TransactionReference(ElementReference):
     def create(self):
         if 'message' in self.data:
             ns_map = {"zz":
-                      "https://www.zimmermanzimmerman.nl"}
+                      "https://www.zimmerman.team"}
             transaction_element = etree.SubElement(
                 self.parent_element,
-                "{https://www.zimmermanzimmerman.nl}"+self.element,
+                "{https://www.zimmerman.team}"+self.element,
                 nsmap=ns_map
             )
         else:
@@ -1175,10 +1175,10 @@ class BudgetReference(ElementReference):
     def create(self):
         if 'message' in self.data:
             ns_map = {"zz":
-                      "https://www.zimmermanzimmerman.nl"}
+                      "https://www.zimmerman.team"}
             budget_element = etree.SubElement(
                 self.parent_element,
-                "{https://www.zimmermanzimmerman.nl}"+self.element,
+                "{https://www.zimmerman.team}"+self.element,
                 nsmap=ns_map
             )
         else:
diff --git a/OIPA/api/organisation/views.py b/OIPA/api/organisation/views.py
index 20136ead1..91c2cf050 100644
--- a/OIPA/api/organisation/views.py
+++ b/OIPA/api/organisation/views.py
@@ -273,7 +273,7 @@ class UpdateOrganisationSearchMixin(object):
 
     def reindex_organisation(self, serializer):
         instance = serializer.instance.get_organisation()
-        self.reindex_organisation(instance)
+        return instance
 
     def perform_create(self, serializer):
         serializer.save()
diff --git a/OIPA/api/publisher/tests/test_verify_key.py b/OIPA/api/publisher/tests/test_verify_key.py
index ae64246cb..b69df7726 100644
--- a/OIPA/api/publisher/tests/test_verify_key.py
+++ b/OIPA/api/publisher/tests/test_verify_key.py
@@ -58,7 +58,7 @@ def fake_call_action(self, arg, whatever):
             u'publisher_organization_type': u'70',
             u'tags': [],
             u'groups': [],
-            u'publisher_ui_url': u'http://www.openaidsearch.org',
+            u'publisher_ui_url': u'https://www.openaidsearch.org',
             u'publisher_timeliness': u'',
             u'publisher_source_type': u'primary_source',
             u'publisher_segmentation': u'',
diff --git a/OIPA/api/renderers.py b/OIPA/api/renderers.py
index f3335d54f..b79eb16a7 100644
--- a/OIPA/api/renderers.py
+++ b/OIPA/api/renderers.py
@@ -891,7 +891,7 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
 
             # the element with namespace must be the last element in the xml.
             for element in self.xml.iter():
-                if element.tag.find("https://www.zimmermanzimmerman.n") != -1:
+                if element.tag.find("https://www.zimmerman.team") != -1:
                     print(element.tag)
                     parent = element.getparent()
                     parent.remove(element)
diff --git a/OIPA/currency_convert/imf_rate_parser.py b/OIPA/currency_convert/imf_rate_parser.py
index f801b64cc..9a47fa7f4 100644
--- a/OIPA/currency_convert/imf_rate_parser.py
+++ b/OIPA/currency_convert/imf_rate_parser.py
@@ -54,8 +54,8 @@ def get_xml_data(self, url, download_url, retry_count=0):
 class RateParser():
 
     def __init__(self):
-        self.imf_url = "http://www.imf.org/external/np/fin/ert/GUI/Pages/Report.aspx?Type=XML&CU=%27EUR%27,%27JPY%27,%27GBP%27,%27USD%27,%27DZD%27,%27AUD%27,%27ATS%27,%27BHD%27,%27BEF%27,%27VEF%27,%27BWP%27,%27BRL%27,%27BND%27,%27CAD%27,%27CLP%27,%27CNY%27,%27COP%27,%27CYP%27,%27CZK%27,%27DKK%27,%27DEM%27,%27FIM%27,%27FRF%27,%27GRD%27,%27HUF%27,%27ISK%27,%27INR%27,%27IDR%27,%27IRR%27,%27IEP%27,%27ILS%27,%27ITL%27,%27KZT%27,%27KRW%27,%27EEK%27,%27KWD%27,%27LYD%27,%27LUF%27,%27MYR%27,%27MTL%27,%27MUR%27,%27MXN%27,%27NPR%27,%27NLG%27,%27NZD%27,%27NOK%27,%27PEN%27,%27PKR%27,%27UYU%27,%27PHP%27,%27PLN%27,%27PTE%27,%27QAR%27,%27OMR%27,%27RUB%27,%27SAR%27,%27SGD%27,%27SKK%27,%27SIT%27,%27ZAR%27,%27ESP%27,%27LKR%27,%27SEK%27,%27CHF%27,%27THB%27,%27TTD%27,%27TND%27,%27AED%27,%27VEB%27&EX=SDRC&P=DateRange&CF=UnCompressed&CUF=Period&DS=Ascending&DT=NA"  # NOQA: E501
-        self.imf_download_url = "http://www.imf.org/external/np/fin/ert/GUI/Pages/ReportData.aspx?Type=XML"  # NOQA: E501
+        self.imf_url = "https://www.imf.org/external/np/fin/ert/GUI/Pages/Report.aspx?Type=XML&CU=%27EUR%27,%27JPY%27,%27GBP%27,%27USD%27,%27DZD%27,%27AUD%27,%27ATS%27,%27BHD%27,%27BEF%27,%27VEF%27,%27BWP%27,%27BRL%27,%27BND%27,%27CAD%27,%27CLP%27,%27CNY%27,%27COP%27,%27CYP%27,%27CZK%27,%27DKK%27,%27DEM%27,%27FIM%27,%27FRF%27,%27GRD%27,%27HUF%27,%27ISK%27,%27INR%27,%27IDR%27,%27IRR%27,%27IEP%27,%27ILS%27,%27ITL%27,%27KZT%27,%27KRW%27,%27EEK%27,%27KWD%27,%27LYD%27,%27LUF%27,%27MYR%27,%27MTL%27,%27MUR%27,%27MXN%27,%27NPR%27,%27NLG%27,%27NZD%27,%27NOK%27,%27PEN%27,%27PKR%27,%27UYU%27,%27PHP%27,%27PLN%27,%27PTE%27,%27QAR%27,%27OMR%27,%27RUB%27,%27SAR%27,%27SGD%27,%27SKK%27,%27SIT%27,%27ZAR%27,%27ESP%27,%27LKR%27,%27SEK%27,%27CHF%27,%27THB%27,%27TTD%27,%27TND%27,%27AED%27,%27VEB%27&EX=SDRC&P=DateRange&CF=UnCompressed&CUF=Period&DS=Ascending&DT=NA"  # NOQA: E501
+        self.imf_download_url = "https://www.imf.org/external/np/fin/ert/GUI/Pages/ReportData.aspx?Type=XML"  # NOQA: E501
         self.updated_imf_url = ''
         self.year = 1993
         self.month = 12
diff --git a/OIPA/iati/PostmanJsonImport/importPostmanJson.py b/OIPA/iati/PostmanJsonImport/importPostmanJson.py
index 126ae995b..7ce8ed074 100644
--- a/OIPA/iati/PostmanJsonImport/importPostmanJson.py
+++ b/OIPA/iati/PostmanJsonImport/importPostmanJson.py
@@ -18,7 +18,7 @@ def get_json(self):
 
         request = urllib.request.Request(
             "https://api.getpostman.com/collections/7423966-c07eebd3-61b2-47b4-9bfd-1bac7ec96c9f",     # NOQA: E501
-            headers={"x-Api-Key": "675aba3b5dec4d39a1abf193d4386c7b"})
+            headers={"x-Api-Key": settings.POSTMAN_API_KEY})
         response = urllib.request.urlopen(request)
         json_string = response.read()
         result_for_test_datastore_iatistandard_org = json.loads(json_string.decode('utf-8-sig'))  # NOQA: E501
diff --git a/OIPA/iati/factory/iati_factory.py b/OIPA/iati/factory/iati_factory.py
index 52dbbcb79..01c063448 100644
--- a/OIPA/iati/factory/iati_factory.py
+++ b/OIPA/iati/factory/iati_factory.py
@@ -210,7 +210,7 @@ class Meta:
     type = SubFactory(ContactTypeFactory)
     telephone = "0044111222333444"
     email = "transparency@example.org"
-    website = "http://www.example.org"
+    website = "https://www.example.org"
 
 
 class RelatedActivityFactory(NoDatabaseFactory):
@@ -673,7 +673,7 @@ class Meta:
     location_id_vocabulary = SubFactory(GeographicVocabularyFactory)
     location_id_code = '23213'
     point_pos = GEOSGeometry(Point(20.22, 45.22), srid=4326)
-    point_srs_name = "http://www.opengis.net/def/crs/EPSG/0/4326"
+    point_srs_name = "https://www.opengis.net/def/crs/EPSG/0/4326"
     exactness = SubFactory(GeographicExactnessFactory)
     location_class = SubFactory(GeographicLocationClassFactory)
     feature_designation = SubFactory(LocationTypeFactory)
@@ -860,7 +860,7 @@ class Meta:
     code = "code"
     type = SubFactory(HumanitarianScopeTypeFactory)
     vocabulary = SubFactory(HumanitarianScopeVocabularyFactory)
-    vocabulary_uri = "http://reference.iatistandard.org/202/activity-standard/\
+    vocabulary_uri = "https://reference.iatistandard.org/202/activity-standard/\
                       iati-activities/iati-activity/humanitarian-scope/"
 
 
diff --git a/OIPA/iati/migrations/OIPA: The IATI Data-engine.html b/OIPA/iati/migrations/OIPA: The IATI Data-engine.html
index 87f49aca4..8cc356b08 100644
--- a/OIPA/iati/migrations/OIPA: The IATI Data-engine.html	
+++ b/OIPA/iati/migrations/OIPA: The IATI Data-engine.html	
@@ -1,32 +1,32 @@
 
 
 <!DOCTYPE html>
-<html>
+<html lang="en">
 	<head>
-	
-	    
+
+
 			<meta charset="utf-8" />
 	        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-	    
+
 	    <title>OIPA: The IATI Data-engine</title>
-		
+
 		    <link rel="stylesheet" type="text/css" href="/static/rest_framework/css/prettify.css"/>
 		    <link rel="stylesheet" href="/static/foundation/stylesheets/app.css" />
 		    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
 		    <script src="/static/foundation/bower_components/modernizr/modernizr.js"></script>
-		
-        
-    
 
-		
+
+
+
+
     <link rel="stylesheet" type="text/css" href="/static/css/drf_customizations.css" />
 
 
-	
+
 	</head>
-	
+
 	<body class="api">
-		
+
 		<header>
 	        <div class="row">
 	        	<!-- <div class="small-7 medium-6 large-5 columns small-centered text-center logostatic">
@@ -48,19 +48,19 @@
 	                <h1>Openaid IATI Parser and API</h1>
 	                <p>OIPA is an IATI data-engine providing a rich and usable API for managing IATI compliant data.</p>
 	                <p class="buttons">
-	                	<a href="https://github.com/zimmerman-zimmerman/OIPA" target="_blank" class="button radius roze">OIPA on Github</a>
+	                	<a href="https://github.com/zimmerman-zimmerman/OIPA" target="_blank" rel="noopener" class="button radius roze">OIPA on Github</a>
 	                </p>
 	            </div>
 	        </div>
 	    </header>
-	    
-	    
+
+
 
 	    <nav>
 	    	<div class="row">
 	    		<div class="columns small-12 text-center">
 	    			<div id="logo" class="visible">
-	    				<a href="https://github.com/zimmerman-zimmerman/OIPA" target="_blank"></a><img src="/static/foundation/img/oipa.svg" > on Github
+	    				<a href="https://github.com/zimmerman-zimmerman/OIPA" rel="noopener" target="_blank"></a><img src="/static/foundation/img/oipa.svg" alt="{This image depicts the text 'OIPA'}"> on Github
     				</div>
 			    	<ul class="tabs">
 			    		<li class="tab-title"><a href="/home">Home</a></li>
@@ -73,65 +73,65 @@ <h1>Openaid IATI Parser and API</h1>
 
 
 
-		
+
 <section class="middle">
 	<div class="row">
 		<div class="columns small-12">
-			
+
 			<ul class="breadcrumbs">
-				
-				
+
+
 				<li><a href="/api/">Welcome</a></li>
-				
-				
-				
+
+
+
 				<li class="current"><a href="/api/activities/">Activity List</a></li>
-				
-				
+
+
 			</ul>
-			
+
 		</div>
 	</div>
 	<div class="row">
 		<div class="columns small-12">
 			<div class="action-buttons right">
-				
+
 				<form class="button-form " id="get-form">
-					
+
 					<button class="button dropdown" data-dropdown="drop1" aria-controls="drop1" aria-expanded="false" title="Specify a format for the GET request">GET</button>
 					<ul id="drop1" data-dropdown-content class="f-dropdown" aria-hidden="true">
-						
+
 						<li>
 							<a href="/api/activities/?convert_to=usd&amp;fields=id%2Ciati_identifier%2Cactivity_dates%2Caggregations%2Ctitle%2Ctransactions&amp;format=api&amp;recipient_country=SS&amp;reporting_organisation_identifier=XM-DAC-47066" rel="nofollow" title="Make a GET request on the Activity List resource with the format set to `api`">api</a>
 						</li>
-						
+
 						<li>
 							<a href="/api/activities/?convert_to=usd&amp;fields=id%2Ciati_identifier%2Cactivity_dates%2Caggregations%2Ctitle%2Ctransactions&amp;format=json&amp;recipient_country=SS&amp;reporting_organisation_identifier=XM-DAC-47066" rel="nofollow" title="Make a GET request on the Activity List resource with the format set to `json`">json</a>
 						</li>
-						
+
 						<li>
 							<a href="/api/activities/?convert_to=usd&amp;fields=id%2Ciati_identifier%2Cactivity_dates%2Caggregations%2Ctitle%2Ctransactions&amp;format=csv&amp;recipient_country=SS&amp;reporting_organisation_identifier=XM-DAC-47066" rel="nofollow" title="Make a GET request on the Activity List resource with the format set to `csv`">csv</a>
 						</li>
-						
+
 					</ul>
-					
+
 				</form>
-				
 
-				
+
+
 				<form class="button-form" action="/api/activities/?fields=id%2Ciati_identifier%2Cactivity_dates%2Caggregations%2Ctitle,transactions&amp;convert_to=usd&amp;recipient_country=SS&amp;reporting_organisation_identifier=XM-DAC-47066" method="POST">
 					<input type='hidden' name='csrfmiddlewaretoken' value='YD0rn3MCirtXpt7f8ddhoHOjIQuZaoTMHXqyi4rjvTYYAlo7PsJeOKD9VNVtuntH' />
 					<input type="hidden" name="" value="OPTIONS" />
 					<button class="btn btn-primary js-tooltip" title="Make an OPTIONS request on the Activity List resource">OPTIONS</button>
 				</form>
-				
 
-				
+
+
 			</div>
 
 			<div class="content-main">
 				<h1>Activity List</h1>
-				
+
 				<p>Returns a list of IATI Activities stored in OIPA.</p>
 <h3 id="request-parameters">Request parameters</h3>
 <ul>
@@ -216,7 +216,7 @@ <h3 id="result-details">Result details</h3>
 including the URI to activity details, which contain all information.
 To show more information in list view the <code>fields</code> parameter can be used. Example;
 <code>fields=activity_id,title,country,any_field</code>.</p>
-				
+
 
 				<div class="request-info" style="clear: both" >
 					<pre class="prettyprint"><b>GET</b> /api/activities/?fields=id%2Ciati_identifier%2Cactivity_dates%2Caggregations%2Ctitle,transactions&amp;convert_to=usd&amp;recipient_country=SS&amp;reporting_organisation_identifier=XM-DAC-47066</pre>
@@ -227,7 +227,7 @@ <h3 id="result-details">Result details</h3>
 						<b>Allow:</b> <span class="lit">GET, HEAD, OPTIONS</span>
 						<b>Content-Type:</b> <span class="lit">application/json</span>
 						<b>Vary:</b> <span class="lit">Accept</span>
-						
+
 					</span>{
     &quot;count&quot;: 9,
     &quot;next&quot;: null,
@@ -1393,34 +1393,34 @@ <h3 id="result-details">Result details</h3>
 				</div>
 			</div>
 
-			
 
-			
 
-			
-			
+
+
+
+
 		</div>
 	</div>
 </section>
 
 
-    	
+
 		<footer>
 	        <div class="row">
 	            <div class="columns small-6 medium-4 large-2 small-centered text-center">
-	            <a href="http://www.zimmermanzimmerman.nl" target="_blank"><img src="/static/foundation/img/zz-logo.svg"></a>
+	            <a href="https://www.zimmerman.team" rel="noopener" target="_blank"><img src="/static/foundation/img/zz-logo.svg" alt="{This image is the text 'Zimmerman' twice positioned on top of each other}"></a>
 	            </div>
 	        </div>
 	        <div class="row">
 	            <div class="columns small-12 small-centered text-center">
-	                <p>Code licensed under the <a href="https://github.com/zimmerman-zimmerman/OIPA/blob/master/LICENSE.MD" target="_blank">GNU AGPL</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
+	                <p>Code licensed under the <a href="https://github.com/zimmerman-zimmerman/OIPA/blob/master/LICENSE.MD" rel="noopener" target="_blank">GNU AGPL</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
 	            </div>
 	        </div>
 	    </footer>
-		
+
 
 	</body>
-	
+
 
 
 
@@ -1440,7 +1440,7 @@ <h3 id="result-details">Result details</h3>
             var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
         })();
 
-    </script>  
+    </script>
 
 
 
diff --git a/OIPA/iati/parser/IATI_2_02.py b/OIPA/iati/parser/IATI_2_02.py
index fe5c3e9b3..332312d2c 100644
--- a/OIPA/iati/parser/IATI_2_02.py
+++ b/OIPA/iati/parser/IATI_2_02.py
@@ -1241,7 +1241,7 @@ def iati_activities__iati_activity__location__administrative(
 
     def iati_activities__iati_activity__location__point(self, element):
         """attributes:
-        srsName:http://www.opengis.net/def/crs/EPSG/0/4326
+        srsName:https://www.opengis.net/def/crs/EPSG/0/4326
 
         tag:point"""
         srs_name = element.attrib.get('srsName')
@@ -1250,7 +1250,7 @@ def iati_activities__iati_activity__location__point(self, element):
         # if not srs_name: raise RequiredFieldError("srsName",
         # "location_point: srsName is required")
         if not srs_name:
-            srs_name = "http://www.opengis.net/def/crs/EPSG/0/4326"
+            srs_name = "https://www.opengis.net/def/crs/EPSG/0/4326"
 
         location = self.get_model('Location')
         location.point_srs_name = srs_name
diff --git a/OIPA/iati/parser/IATI_2_03.py b/OIPA/iati/parser/IATI_2_03.py
index f4c30c62f..b4f59092a 100644
--- a/OIPA/iati/parser/IATI_2_03.py
+++ b/OIPA/iati/parser/IATI_2_03.py
@@ -1288,7 +1288,7 @@ def iati_activities__iati_activity__location__administrative(
 
     def iati_activities__iati_activity__location__point(self, element):
         """attributes:
-        srsName:http://www.opengis.net/def/crs/EPSG/0/4326
+        srsName:https://www.opengis.net/def/crs/EPSG/0/4326
 
         tag:point"""
         srs_name = element.attrib.get('srsName')
@@ -1300,7 +1300,7 @@ def iati_activities__iati_activity__location__point(self, element):
                 "location_point: srsName is required")
 
         if not srs_name:
-            srs_name = "http://www.opengis.net/def/crs/EPSG/0/4326"
+            srs_name = "https://www.opengis.net/def/crs/EPSG/0/4326"
 
         location = self.get_model('Location')
         location.point_srs_name = srs_name
diff --git a/OIPA/iati/parser/parse_manager.py b/OIPA/iati/parser/parse_manager.py
index 24e40b48f..fe80f6def 100644
--- a/OIPA/iati/parser/parse_manager.py
+++ b/OIPA/iati/parser/parse_manager.py
@@ -117,7 +117,8 @@ def __init__(self, dataset, root=None, force_reparse=False):
             dataset.save()
 
         try:
-            parser = etree.XMLParser(huge_tree=True)
+            parser = etree.XMLParser(resolve_entities=False,
+                                     no_network=True, huge_tree=True)
             tree = etree.parse(BytesIO(response.content), parser)
             self.root = tree.getroot()
             self.parser = self._prepare_parser(self.root, dataset)
diff --git a/OIPA/iati/parser/tests/test_2_03_parser.py b/OIPA/iati/parser/tests/test_2_03_parser.py
index 59b6972d6..d42466cec 100644
--- a/OIPA/iati/parser/tests/test_2_03_parser.py
+++ b/OIPA/iati/parser/tests/test_2_03_parser.py
@@ -334,7 +334,7 @@ def test_activity_tag(self):
 
             # "vocabulary": '1',
             "code": '1',
-            'vocabulary-uri': 'http://example.com/vocab.html',
+            'vocabulary-uri': 'https://example.com/vocab.html',
         }
 
         activity_tag_XML_element = E(
@@ -443,7 +443,7 @@ def test_activity_tag(self):
         # ALL IS GOOD:
         activity_tag_attributes[
             'vocabulary-uri'
-        ] = 'http://example.com/vocab.html'
+        ] = 'https://example.com/vocab.html'
 
         activity_tag_XML_element = E(
             'tag',
@@ -830,7 +830,7 @@ def test_recipient_region(self):
             "code": region.code,
             "vocabulary": str(vocabulary.code),
             "percentage": '100',
-            "vocabulary-uri": "http://www.google.lt",
+            "vocabulary-uri": "https://www.google.lt",
         }
 
         recipient_region_XML_element = E(
@@ -1070,7 +1070,7 @@ def test_activity_sector(self):
             "code": sector.code,
             "vocabulary": str(vocabulary.code),
             "percentage": '100',
-            "vocabulary-uri": "http://www.google.lt",
+            "vocabulary-uri": "https://www.google.lt",
         }
 
         sector_XML_element = E(
@@ -1785,7 +1785,7 @@ def test_activity_result_document_link(self):
             FileFormatFactory(code='application/pdf')
 
         dummy_document_link = iati_factory.\
-            DocumentLinkFactory(url='http://aasamannepal.org.np/')
+            DocumentLinkFactory(url='https://example.com')
 
         self.parser_203.codelist_cache = {}
 
@@ -1858,7 +1858,7 @@ def test_activity_result_document_link_title(self):
             FileFormatFactory(code='application/pdf')
 
         dummy_document_link = iati_factory. \
-            DocumentLinkFactory(url='http://aasamannepal.org.np/')
+            DocumentLinkFactory(url='https://example.com/')
 
         self.parser_203.codelist_cache = {}
 
@@ -2489,7 +2489,7 @@ def test_activity_result_indicator_document_link(self):
             FileFormatFactory(code='application/pdf')
 
         dummy_document_link = iati_factory.\
-            DocumentLinkFactory(url='http://aasamannepal.org.np/')
+            DocumentLinkFactory(url='https://example.com/')
 
         self.parser_203.codelist_cache = {}
 
@@ -2673,7 +2673,7 @@ def test_activity_result_indicator_document_link_title(self):
             FileFormatFactory(code='application/pdf')
 
         dummy_indicator_document_link = iati_factory. \
-            DocumentLinkFactory(url='http://aasamannepal.org.np/')
+            DocumentLinkFactory(url='https://example.com/')
 
         self.parser_203.codelist_cache = {}
 
@@ -3338,7 +3338,7 @@ def test_activity_result_indicator_baseline_document_link(self):
             FileFormatFactory(code='application/pdf')
 
         dummy_document_link = iati_factory.\
-            DocumentLinkFactory(url='http://aasamannepal.org.np/')
+            DocumentLinkFactory(url='https://example.com/')
 
         self.parser_203.codelist_cache = {}
 
@@ -4130,7 +4130,7 @@ def test_activity_result_indicatior_period_target_document_link(  # NOQA: E501
             FileFormatFactory(code='application/pdf')
 
         dummy_document_link = iati_factory.\
-            DocumentLinkFactory(url='http://aasamannepal.org.np/')
+            DocumentLinkFactory(url='https://example.com/')
 
         self.parser_203.codelist_cache = {}
 
@@ -4219,7 +4219,7 @@ def test_activity_result_indicatior_baseline_document_link_title(
             FileFormatFactory(code='application/pdf')
 
         dummy_document_link = iati_factory. \
-            DocumentLinkFactory(url='http://aasamannepal.org.np/')
+            DocumentLinkFactory(url='https://example.com/')
 
         self.parser_203.codelist_cache = {}
 
@@ -4896,7 +4896,7 @@ def test_activity_result_indicator_period_actual_document_link(self):
         self.parser_203.codelist_cache = {}
 
         result_indicator_period_actual_document_link_attr = {
-            "url": 'http://aasamannepal.org.np/',
+            "url": 'https://example.com/',
             "format": dummy_file_format.code
         }
 
@@ -5121,7 +5121,7 @@ def test_activity_result_indicator_period_actual_document_link_title(self):
             FileFormatFactory(code='application/pdf')
 
         dummy_indicator_period_actual_document_link = iati_factory. \
-            DocumentLinkFactory(url='http://aasamannepal.org.np/')
+            DocumentLinkFactory(url='https://example.com/')
 
         self.parser_203.codelist_cache = {}
 
diff --git a/OIPA/iati/tests/test_parser_fields.py b/OIPA/iati/tests/test_parser_fields.py
index 50df425f2..14e409dee 100644
--- a/OIPA/iati/tests/test_parser_fields.py
+++ b/OIPA/iati/tests/test_parser_fields.py
@@ -41,7 +41,7 @@ def build_xml(version, iati_identifier):
     activities_attrs = {
         "generated-datetime": datetime.datetime.now().isoformat(),
         "version": version,
-        "linked-data-default": "http://zimmermanzimmerman.nl/",
+        "linked-data-default": "https://zimmerman.team/",
     }
 
     activity = E("iati-activities", **activities_attrs)
@@ -160,7 +160,7 @@ def setUp(self):
             # "xml:lang": "en",
             "default-currency": "USD",
             "last-updated-datetime": datetime.datetime.now().isoformat(' '),
-            "linked-data-uri": "http://zimmermanzimmerman.org/iati",
+            "linked-data-uri": "https://zimmerman.team/iati",
             "hierarchy": "1",
         }
 
@@ -308,7 +308,7 @@ def test_activity_linked_data_uri_inherited(self):
         """
         raise NotImplementedError()
 
-        linked_data_default = "http://zimmermanzimmerman.org/"
+        linked_data_default = "https://zimmerman.team/"
 
         iati_202 = copy_xml_tree(self.iati_202)
         iati_202.set("linked-data-default", linked_data_default)
@@ -1470,7 +1470,7 @@ def setUp(self):
             "code": "89",  # Europe, regional
             "vocabulary": "1",  # OECD-DAC
             "percentage": "50.5",
-            "vocabulary-uri": "http://example.com/vocab.html"
+            "vocabulary-uri": "https://example.com/vocab.html"
         }
 
         self.recipient_region = E('recipient-region', **self.attrs)
@@ -1707,13 +1707,13 @@ def test_location_administrative_103(self):
     def test_location_point_202(self):
         # Global Point Unit layers
         point = E(
-            'point', srsName="http://www.opengis.net/def/crs/EPSG/0/4326"
+            'point', srsName="https://www.opengis.net/def/crs/EPSG/0/4326"
         )
         self.parser_202.iati_activities__iati_activity__location__point(point)
         location = self.parser_202.get_model('Location')
 
         self.assertEqual(location.point_srs_name,
-                         "http://www.opengis.net/def/crs/EPSG/0/4326")
+                         "https://www.opengis.net/def/crs/EPSG/0/4326")
 
     def test_location_pos_pos_valid_latlong_202(self):
         """
@@ -1767,7 +1767,7 @@ def test_location_coordinates_103(self):
         location = self.parser_103.get_model('Location')
 
         self.assertEqual(location.point_srs_name,
-                         "http://www.opengis.net/def/crs/EPSG/0/4326")
+                         "https://www.opengis.net/def/crs/EPSG/0/4326")
         # Geodjango Location = longlat
         self.assertEqual(location.point_pos.coords, (65.716944, 31.616944))
         self.assertEqual(location.exactness.code, "1")
@@ -1843,7 +1843,7 @@ def setUp(self):
             "code": "11110",  # Education Policy and administrative management
             "vocabulary": "1",  # OECD-DAC-5
             "percentage": "50.5",
-            "vocabulary-uri": "http://example.com/vocab.html"
+            "vocabulary-uri": "https://example.com/vocab.html"
         }
 
         self.sector = E('sector', **self.attrs)
@@ -2023,7 +2023,7 @@ def setUp(self):
             "type": "1",
             "vocabulary": "1-1",
             "code": "2015-000050",
-            "vocabulary-uri": "http://example.com/vocab.html"
+            "vocabulary-uri": "https://example.com/vocab.html"
         }
 
         self.humanitarian_scope = E('humanitarian-scope', **self.attrs)
@@ -2081,7 +2081,7 @@ def setUp(self):
         self.attrs = {
             "code": "1",  # Gender Equality
             "vocabulary": "1",  # OECD-DAC CRS
-            "vocabulary-uri": "http://example.com/vocab.html",
+            "vocabulary-uri": "https://example.com/vocab.html",
             "significance": "1",  # Significant objective
         }
 
@@ -2765,7 +2765,7 @@ def test_transaction_sector_202(self):
         attrs = {
             "code": "11110",  # Education Policy and administrative management
             "vocabulary": "1",  # OECD-DAC-5
-            "vocabulary-uri": "http://example.com/vocab.html"
+            "vocabulary-uri": "https://example.com/vocab.html"
         }
 
         sector = E('sector', **attrs)
@@ -2812,7 +2812,7 @@ def test_transaction_recipient_region_202(self):
             "code": "89",  # Europe, regional
             "vocabulary": "1",  # OECD-DAC
             "percentage": "50.5",
-            "vocabulary-uri": "http://example.com/vocab.html"
+            "vocabulary-uri": "https://example.com/vocab.html"
         }
 
         recipient_region = E('recipient_region', **attrs)
@@ -3159,7 +3159,7 @@ def setUp(self):
         self.iati_202 = copy_xml_tree(self.iati_202)
 
         self.attrs = {
-            "url": "http://zimmermanzimmerman.nl/",
+            "url": "https://zimmerman.team/",
             "format": "text/html",
         }
 
@@ -3631,7 +3631,7 @@ def test_result_indicator_reference_202(self):
         attrs = {
             'code': 'B1',
             'vocabulary': '99',
-            'indicator-uri': 'http://example.com/indicators.html'
+            'indicator-uri': 'https://example.com/indicators.html'
         }
         reference = E('reference', **attrs)
 
diff --git a/OIPA/iati_synchroniser/models.py b/OIPA/iati_synchroniser/models.py
index 4ea60432a..eacbe698a 100644
--- a/OIPA/iati_synchroniser/models.py
+++ b/OIPA/iati_synchroniser/models.py
@@ -162,7 +162,9 @@ def update_activities_count(self):
 
             # Get version from the XML
             if not self.iati_version:
-                parser = etree.XMLParser(huge_tree=True, encoding='utf-8')
+                parser = etree.XMLParser(resolve_entities=False,
+                                         no_network=True,
+                                         huge_tree=True, encoding='utf-8')
                 parser_tree = etree.parse(BytesIO(response.content), parser)
                 root = parser_tree.getroot()
 
diff --git a/OIPA/requirements.txt b/OIPA/requirements.txt
index 03453d5d7..781626a95 100644
--- a/OIPA/requirements.txt
+++ b/OIPA/requirements.txt
@@ -72,7 +72,7 @@ mock==2.0.0
 factory-boy==2.11.1
 
 # Working with XML files
-lxml==4.6.2
+lxml==4.6.3
 
 # Extensions to the standard datetime module:
 python-dateutil==2.7.3
@@ -128,7 +128,7 @@ git+https://github.com/zimmerman-zimmerman/django-supervisor@07c67b4daebe4ebae5e
 # mainly used for 'shell_plus' management command:
 django-extensions==2.0.7
 
-django-debug-toolbar==1.9.1
+django-debug-toolbar==1.11.1
 
 # Interactive Python debugger:
 ipdb==0.11
diff --git a/OIPA/static/foundation/index.html b/OIPA/static/foundation/index.html
index c20dda90d..427a3ac70 100644
--- a/OIPA/static/foundation/index.html
+++ b/OIPA/static/foundation/index.html
@@ -69,7 +69,7 @@ <h1>Showcase</h1>
     <footer>
       <div class="row">
         <div class="columns small-6 medium-4 large-2 small-centered text-center">
-          <a href="http://www.zimmermanzimmerman.nl" target="_blank"><img src="img/zz-logo.svg"></a>
+          <a href="https://www.zimmerman.team" rel="noopener" target="_blank"><img src="img/zz-logo.svg"></a>
         </div>
       </div>
     </footer>
diff --git a/README.MD b/README.MD
index b273bf965..ea06f9bea 100644
--- a/README.MD
+++ b/README.MD
@@ -118,7 +118,7 @@ Full API documentation for iati.cloud can be found at [docs.iati.cloud](https://
 
 ## About the project
 - Website: [www.iati.cloud](https://www.iati.cloud)
-- Authors: [Zimmerman B.V.](https://www.zimmermanzimmerman.nl/)
+- Authors: [Zimmerman B.V.](https://www.zimmerman.team/)
 - License: AGPLv3 (see included [LICENSE](https://github.com/zimmerman-team/iati.cloud/blob/master/LICENSE.MD) file for full license)
 - Github Repo: [github.com/zimmerman-zimmerman/iati.cloud/](https://github.com/zimmerman-team/iati.cloud/)
 - Bug Tracker: [github.com/zimmerman-zimmerman/iati.cloud/issues](https://github.com/zimmerman-team/iati.cloud/issues)