--- a/documents/datagov-export.py
+++ b/documents/datagov-export.py
@@ -11,9 +11,11 @@
 
 # Instantiate the CKAN client.
 api_key = 'ff34526e-f794-4068-8235-fcbba38cd8bc'
-ckan = ckanclient.CkanClient(base_location='http://data.disclosurelo.gs/api',
+server = 'data.disclosurelo.gs'
+
+ckan = ckanclient.CkanClient(base_location='http://'+server+'api',
                              api_key=api_key)
-ckandirect = ckanapi.RemoteCKAN('http://data.disclosurelo.gs', api_key=api_key)
+ckandirect = ckanapi.RemoteCKAN('http://'+server, api_key=api_key)
 couch = couchdb.Server('http://127.0.0.1:5984/')
 #couch = couchdb.Server('http://192.168.1.113:5984/')
 
@@ -182,8 +184,9 @@
                 extras = []
 
                 for extra_key in doc.value['metadata'].keys():
-                    if extra_key != "Keywords / Tags" and extra_key != "data.gov.au Category" and extra_key != "Download" :
-                        extras.append({'key':extra_key, 'value':doc.value['metadata'][extra_key]})
+                    if extra_key not in ["Description","Content-Language","DCTERMS.Description", "Keywords / Tags" ,"data.gov.au Category", "Download", "Permalink","DCTERMS.Identifier"]:
+			if doc.value['metadata'][extra_key] != None and doc.value['metadata'][extra_key] != "":
+	                        extras.append([extra_key, doc.value['metadata'][extra_key]])
 
                 package_entity = {
                     'name': pkg_name,