diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php
index 8a1a366678..79ce4b658d 100644
--- a/lib/PlaceLookup.php
+++ b/lib/PlaceLookup.php
@@ -2,8 +2,8 @@
 
 namespace Nominatim;
 
-require_once(CONST_BasePath.'/lib/AddressDetails.php');
-require_once(CONST_BasePath.'/lib/Result.php');
+require_once CONST_BasePath.'/lib/AddressDetails.php';
+require_once CONST_BasePath.'/lib/Result.php';
 
 class PlaceLookup
 {
@@ -26,6 +26,9 @@ class PlaceLookup
     protected $sAllowedTypesSQLList = null;
     protected $bDeDupe = true;
 
+    protected $aLicence = 'Data © OpenStreetMap contributors, ODbL 1.0.';
+    protected $aCopyright = 'https://osm.org/copyright';
+
 
     public function __construct(&$oDB)
     {
@@ -89,9 +92,15 @@ public function getMoreUrlParams()
     {
         $aParams = array();
 
-        if ($this->bAddressDetails) $aParams['addressdetails'] = '1';
-        if ($this->bExtraTags) $aParams['extratags'] = '1';
-        if ($this->bNameDetails) $aParams['namedetails'] = '1';
+        if ($this->bAddressDetails) {
+            $aParams['addressdetails'] = '1';
+        }
+        if ($this->bExtraTags) {
+            $aParams['extratags'] = '1';
+        }
+        if ($this->bNameDetails) {
+            $aParams['namedetails'] = '1';
+        }
 
         if ($this->bIncludePolygonAsText) $aParams['polygon_text'] = '1';
         if ($this->bIncludePolygonAsGeoJSON) $aParams['polygon_geojson'] = '1';
@@ -102,7 +111,9 @@ public function getMoreUrlParams()
             $aParams['polygon_threshold'] = $this->fPolygonSimplificationThreshold;
         }
 
-        if (!$this->bDeDupe) $aParams['dedupe'] = '0';
+        if (!$this->bDeDupe) {
+            $aParams['dedupe'] = '0';
+        }
 
         return $aParams;
     }
@@ -147,8 +158,9 @@ private function addressImportanceSql($sGeometry, $sPlaceId)
 
     private function langAddressSql($sHousenumber)
     {
-        if ($this->bAddressDetails)
+        if ($this->bAddressDetails) {
             return ''; // langaddress will be computed from address details
+        }
 
         return 'get_address_by_language(place_id,'.$sHousenumber.','.$this->aLangPrefOrderSql.') AS langaddress,';
     }
@@ -234,10 +246,15 @@ public function lookup($aResults, $iMinRank = 0, $iMaxRank = 30)
             $sSQL .= '     housenumber,';
             $sSQL .= '     country_code, ';
             $sSQL .= '     importance, ';
-            if (!$this->bDeDupe) $sSQL .= 'place_id,';
-            if (!$this->bAddressDetails) $sSQL .= 'langaddress, ';
+            if (!$this->bDeDupe) {
+                $sSQL .= 'place_id,';
+            }
+            if (!$this->bAddressDetails) {
+                $sSQL .= 'langaddress, ';
+            }
             $sSQL .= '     placename, ';
             $sSQL .= '     ref, ';
+
             if ($this->bExtraTags) $sSQL .= 'extratags, ';
             if ($this->bNameDetails) $sSQL .= 'name, ';
             $sSQL .= '     extra_place ';
@@ -260,8 +277,12 @@ public function lookup($aResults, $iMinRank = 0, $iMaxRank = 30)
             $sSQL .= $this->langAddressSql('-1');
             $sSQL .= '  postcode as placename,';
             $sSQL .= '  postcode as ref,';
-            if ($this->bExtraTags) $sSQL .= 'null::text AS extra,';
-            if ($this->bNameDetails) $sSQL .= 'null::text AS names,';
+            if ($this->bExtraTags) {
+                $sSQL .= 'null::text AS extra,';
+            }
+            if ($this->bNameDetails) {
+                $sSQL .= 'null::text AS names,';
+            }
             $sSQL .= '  ST_x(geometry) AS lon, ST_y(geometry) AS lat,';
             $sSQL .= '  (0.75-(rank_search::float/40)) AS importance, ';
             $sSQL .= $this->addressImportanceSql('geometry', 'lp.parent_place_id');
@@ -298,8 +319,12 @@ public function lookup($aResults, $iMinRank = 0, $iMaxRank = 30)
                     $sSQL .= $this->langAddressSql('housenumber_for_place');
                     $sSQL .= '     null::text AS placename, ';
                     $sSQL .= '     null::text AS ref, ';
-                    if ($this->bExtraTags) $sSQL .= 'null::text AS extra,';
-                    if ($this->bNameDetails) $sSQL .= 'null::text AS names,';
+                    if ($this->bExtraTags) {
+                        $sSQL .= 'null::text AS extra,';
+                    }
+                    if ($this->bNameDetails) {
+                        $sSQL .= 'null::text AS names,';
+                    }
                     $sSQL .= '     st_x(centroid) AS lon, ';
                     $sSQL .= '     st_y(centroid) AS lat,';
                     $sSQL .= '     -1.15 AS importance, ';
@@ -344,8 +369,12 @@ public function lookup($aResults, $iMinRank = 0, $iMaxRank = 30)
                 $sSQL .= $this->langAddressSql('housenumber_for_place');
                 $sSQL .= '  null::text AS placename, ';
                 $sSQL .= '  null::text AS ref, ';
-                if ($this->bExtraTags) $sSQL .= 'null::text AS extra, ';
-                if ($this->bNameDetails) $sSQL .= 'null::text AS names, ';
+                if ($this->bExtraTags) {
+                    $sSQL .= 'null::text AS extra, ';
+                }
+                if ($this->bNameDetails) {
+                    $sSQL .= 'null::text AS names, ';
+                }
                 $sSQL .= '  st_x(centroid) AS lon, ';
                 $sSQL .= '  st_y(centroid) AS lat, ';
                 // slightly smaller than the importance for normal houses
@@ -393,8 +422,12 @@ public function lookup($aResults, $iMinRank = 0, $iMaxRank = 30)
                     $sSQL .= $this->langAddressSql('-1');
                     $sSQL .= '     null::text AS placename, ';
                     $sSQL .= '     null::text AS ref, ';
-                    if ($this->bExtraTags) $sSQL .= 'null::text AS extra, ';
-                    if ($this->bNameDetails) $sSQL .= 'null::text AS names, ';
+                    if ($this->bExtraTags) {
+                        $sSQL .= 'null::text AS extra, ';
+                    }
+                    if ($this->bNameDetails) {
+                        $sSQL .= 'null::text AS names, ';
+                    }
                     $sSQL .= '     ST_X(centroid) AS lon, ';
                     $sSQL .= '     ST_Y(centroid) AS lat, ';
                     $sSQL .= '     -1.10 AS importance, ';
@@ -421,6 +454,7 @@ public function lookup($aResults, $iMinRank = 0, $iMaxRank = 30)
 
         foreach ($aPlaces as &$aPlace) {
             $aPlace['importance'] = (float) $aPlace['importance'];
+
             if ($this->bAddressDetails) {
                 // to get addressdetails for tiger data, the housenumber is needed
                 $aPlace['address'] = new AddressDetails(
@@ -432,9 +466,19 @@ public function lookup($aResults, $iMinRank = 0, $iMaxRank = 30)
                 $aPlace['langaddress'] = $aPlace['address']->getLocaleAddress();
             }
 
+            $aPlace['licence'] = ($this->aLicence);
+            $aPlace['copyright'] = ($this->aCopyright);
+
             if ($this->bExtraTags) {
                 if ($aPlace['extra']) {
                     $aPlace['sExtraTags'] = json_decode($aPlace['extra']);
+                    
+                    if ($aPlace['sExtraTags']->licence) {
+                        $aPlace['licence'] = $aPlace['sExtraTags']->data_licence;
+                    }
+                    if ($aPlace['sExtraTags']->copyright) {
+                        $aPlace['copyright'] = $aPlace['sExtraTags']->data_copyright;
+                    }
                 } else {
                     $aPlace['sExtraTags'] = (object) array();
                 }
@@ -476,7 +520,9 @@ public function getOutlines($iPlaceID, $fLon = null, $fLat = null, $fRadius = nu
     {
 
         $aOutlineResult = array();
-        if (!$iPlaceID) return $aOutlineResult;
+        if (!$iPlaceID) {
+            return $aOutlineResult;
+        }
 
         if (CONST_Search_AreaPolygons) {
             // Get the bounding box and outline polygon
@@ -489,10 +535,12 @@ public function getOutlines($iPlaceID, $fLon = null, $fLat = null, $fRadius = nu
             }
             $sSQL .= ' ST_YMin(geometry) as minlat,ST_YMax(geometry) as maxlat,';
             $sSQL .= ' ST_XMin(geometry) as minlon,ST_XMax(geometry) as maxlon';
+
             if ($this->bIncludePolygonAsGeoJSON) $sSQL .= ',ST_AsGeoJSON(geometry) as asgeojson';
             if ($this->bIncludePolygonAsKML) $sSQL .= ',ST_AsKML(geometry) as askml';
             if ($this->bIncludePolygonAsSVG) $sSQL .= ',ST_AsSVG(geometry) as assvg';
             if ($this->bIncludePolygonAsText) $sSQL .= ',ST_AsText(geometry) as astext';
+
             if ($fLonReverse != null && $fLatReverse != null) {
                 $sFrom = ' from (SELECT * , CASE WHEN (class = \'highway\') AND (ST_GeometryType(geometry) = \'ST_LineString\') THEN ';
                 $sFrom .=' ST_ClosestPoint(geometry, ST_SetSRID(ST_Point('.$fLatReverse.','.$fLonReverse.'),4326))';
diff --git a/lib/template/address-geocodejson.php b/lib/template/address-geocodejson.php
index 0066e80e29..813886130f 100644
--- a/lib/template/address-geocodejson.php
+++ b/lib/template/address-geocodejson.php
@@ -5,9 +5,11 @@
 $aFilteredPlaces = array();
 
 if (empty($aPlace)) {
-    if (isset($sError))
+    if (isset($sError)) {
         $aFilteredPlaces['error'] = $sError;
-    else $aFilteredPlaces['error'] = 'Unable to geocode';
+    } else {
+        $aFilteredPlaces['error'] = 'Unable to geocode';
+    }
     javascript_renderData($aFilteredPlaces);
 } else {
     $aFilteredPlaces = array(
@@ -17,7 +19,14 @@
                                         )
                        );
 
-    if (isset($aPlace['place_id'])) $aFilteredPlaces['properties']['geocoding']['place_id'] = $aPlace['place_id'];
+    if (isset($aPlace['place_id'])) {
+        $aFilteredPlaces['properties']['geocoding']['place_id'] = $aPlace['place_id'];
+    }
+
+    $aFilteredPlaces['properties']['geocoding']['licence'] = $aPlace['licence'];
+
+    $aFilteredPlaces['properties']['geocoding']['copyright'] = $aPlace['copyright'];
+                                 
     $sOSMType = formatOSMType($aPlace['osm_type']);
     if ($sOSMType) {
         $aFilteredPlaces['properties']['geocoding']['osm_type'] = $sOSMType;
@@ -55,14 +64,16 @@
                                        );
     }
 
-    javascript_renderData(array(
-                           'type' => 'FeatureCollection',
-                           'geocoding' => array(
-                                           'version' => '0.1.0',
-                                           'attribution' => 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright',
-                                           'licence' => 'ODbL',
-                                           'query' => $sQuery
+    javascript_renderData(
+        array(
+         'type' => 'FeatureCollection',
+         'geocoding' => array(
+                         'version' => '0.1.0',
+                        //  'attribution' => 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright',
+                        //    'licence' => 'ODbL',
+                         'query' => $sQuery
                                           ),
-                           'features' => array($aFilteredPlaces)
-                          ));
+         'features' => array($aFilteredPlaces)
+        )
+    );
 }
diff --git a/lib/template/address-geojson.php b/lib/template/address-geojson.php
index 089a86b683..a48302e472 100644
--- a/lib/template/address-geojson.php
+++ b/lib/template/address-geojson.php
@@ -3,9 +3,11 @@
 $aFilteredPlaces = array();
 
 if (empty($aPlace)) {
-    if (isset($sError))
+    if (isset($sError)) {
         $aFilteredPlaces['error'] = $sError;
-    else $aFilteredPlaces['error'] = 'Unable to geocode';
+    } else {
+        $aFilteredPlaces['error'] = 'Unable to geocode';
+    }
     javascript_renderData($aFilteredPlaces);
 } else {
     $aFilteredPlaces = array(
@@ -13,7 +15,14 @@
                         'properties' => array()
                        );
 
-    if (isset($aPlace['place_id'])) $aFilteredPlaces['properties']['place_id'] = $aPlace['place_id'];
+    if (isset($aPlace['place_id'])) {
+        $aFilteredPlaces['properties']['place_id'] = $aPlace['place_id'];
+    }
+
+    $aFilteredPlaces['properties']['licence'] = $aPlace['licence'];
+
+    $aFilteredPlaces['properties']['copyright'] = $aPlace['copyright'];
+ 
     $sOSMType = formatOSMType($aPlace['osm_type']);
     if ($sOSMType) {
         $aFilteredPlaces['properties']['osm_type'] = $sOSMType;
@@ -36,8 +45,12 @@
     if (isset($aPlace['address'])) {
         $aFilteredPlaces['properties']['address'] = $aPlace['address']->getAddressNames();
     }
-    if (isset($aPlace['sExtraTags'])) $aFilteredPlaces['properties']['extratags'] = $aPlace['sExtraTags'];
-    if (isset($aPlace['sNameDetails'])) $aFilteredPlaces['properties']['namedetails'] = $aPlace['sNameDetails'];
+    if (isset($aPlace['sExtraTags'])) {
+        $aFilteredPlaces['properties']['extratags'] = $aPlace['sExtraTags'];
+    }
+    if (isset($aPlace['sNameDetails'])) {
+        $aFilteredPlaces['properties']['namedetails'] = $aPlace['sNameDetails'];
+    }
 
     if (isset($aPlace['aBoundingBox'])) {
         $aFilteredPlaces['bbox'] = array(
@@ -61,9 +74,11 @@
     }
 
 
-    javascript_renderData(array(
-                           'type' => 'FeatureCollection',
-                           'licence' => 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright',
-                           'features' => array($aFilteredPlaces)
-                          ));
+    javascript_renderData(
+        array(
+         'type' => 'FeatureCollection',
+                        //    'licence' => 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright',
+         'features' => array($aFilteredPlaces)
+        )
+    );
 }
diff --git a/lib/template/address-json.php b/lib/template/address-json.php
index 691d6a749f..f1f177d54d 100644
--- a/lib/template/address-json.php
+++ b/lib/template/address-json.php
@@ -3,19 +3,30 @@
 $aFilteredPlaces = array();
 
 if (empty($aPlace)) {
-    if (isset($sError))
+    if (isset($sError)) {
         $aFilteredPlaces['error'] = $sError;
-    else $aFilteredPlaces['error'] = 'Unable to geocode';
+    } else {
+        $aFilteredPlaces['error'] = 'Unable to geocode';
+    }
 } else {
-    if (isset($aPlace['place_id'])) $aFilteredPlaces['place_id'] = $aPlace['place_id'];
-    $aFilteredPlaces['licence'] = 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright';
+    if (isset($aPlace['place_id'])) {
+        $aFilteredPlaces['place_id'] = $aPlace['place_id'];
+    }
+    // $aFilteredPlaces['licence'] = 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright';
+    $aFilteredPlaces['licence'] = $aPlace['licence'];
+    $aFilteredPlaces['copyright'] = $aPlace['copyright'];
+    
     $sOSMType = formatOSMType($aPlace['osm_type']);
     if ($sOSMType) {
         $aFilteredPlaces['osm_type'] = $sOSMType;
         $aFilteredPlaces['osm_id'] = $aPlace['osm_id'];
     }
-    if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat'];
-    if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon'];
+    if (isset($aPlace['lat'])) {
+        $aFilteredPlaces['lat'] = $aPlace['lat'];
+    }
+    if (isset($aPlace['lon'])) {
+        $aFilteredPlaces['lon'] = $aPlace['lon'];
+    }
 
     if ($sOutputFormat == 'jsonv2' || $sOutputFormat == 'geojson') {
         $aFilteredPlaces['place_rank'] = $aPlace['rank_search'];
@@ -35,8 +46,12 @@
     if (isset($aPlace['address'])) {
         $aFilteredPlaces['address'] = $aPlace['address']->getAddressNames();
     }
-    if (isset($aPlace['sExtraTags'])) $aFilteredPlaces['extratags'] = $aPlace['sExtraTags'];
-    if (isset($aPlace['sNameDetails'])) $aFilteredPlaces['namedetails'] = $aPlace['sNameDetails'];
+    if (isset($aPlace['sExtraTags'])) {
+        $aFilteredPlaces['extratags'] = $aPlace['sExtraTags'];
+    }
+    if (isset($aPlace['sNameDetails'])) {
+        $aFilteredPlaces['namedetails'] = $aPlace['sNameDetails'];
+    }
 
     if (isset($aPlace['aBoundingBox'])) {
         $aFilteredPlaces['boundingbox'] = $aPlace['aBoundingBox'];
diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index a17da73821..509b984ce1 100644
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -7,22 +7,36 @@
 
 echo '<reversegeocode';
 echo " timestamp='".date(DATE_RFC822)."'";
-echo " attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright'";
+// echo " attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright'";
 echo " querystring='".htmlspecialchars($_SERVER['QUERY_STRING'], ENT_QUOTES)."'";
 echo ">\n";
 
 if (empty($aPlace)) {
-    if (isset($sError))
+    if (isset($sError)) {
         echo "<error>$sError</error>";
-    else echo '<error>Unable to geocode</error>';
+    } else {
+        echo '<error>Unable to geocode</error>';
+    }
 } else {
     echo '<result';
-    if ($aPlace['place_id']) echo ' place_id="'.$aPlace['place_id'].'"';
+    if ($aPlace['place_id']) {
+        echo ' place_id="'.$aPlace['place_id'].'"';
+    }
+    echo ' licence="'.$aPlace['licence'].'"';
+    echo ' copyright="'.$aPlace['copyright'].'"';
     $sOSMType = formatOSMType($aPlace['osm_type']);
-    if ($sOSMType) echo ' osm_type="'.$sOSMType.'"'.' osm_id="'.$aPlace['osm_id'].'"';
-    if ($aPlace['ref']) echo ' ref="'.htmlspecialchars($aPlace['ref']).'"';
-    if (isset($aPlace['lat'])) echo ' lat="'.htmlspecialchars($aPlace['lat']).'"';
-    if (isset($aPlace['lon'])) echo ' lon="'.htmlspecialchars($aPlace['lon']).'"';
+    if ($sOSMType) {
+        echo ' osm_type="'.$sOSMType.'"'.' osm_id="'.$aPlace['osm_id'].'"';
+    }
+    if ($aPlace['ref']) {
+        echo ' ref="'.htmlspecialchars($aPlace['ref']).'"';
+    }
+    if (isset($aPlace['lat'])) {
+        echo ' lat="'.htmlspecialchars($aPlace['lat']).'"';
+    }
+    if (isset($aPlace['lon'])) {
+        echo ' lon="'.htmlspecialchars($aPlace['lon']).'"';
+    }
     if (isset($aPlace['aBoundingBox'])) {
         echo ' boundingbox="';
         echo join(',', $aPlace['aBoundingBox']);
diff --git a/lib/template/search-batch-json.php b/lib/template/search-batch-json.php
index c4bc29cb1d..17578a6387 100644
--- a/lib/template/search-batch-json.php
+++ b/lib/template/search-batch-json.php
@@ -1,15 +1,19 @@
 <?php
 
 $aOutput = array();
-$aOutput['licence'] = 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright';
+// $aOutput['licence'] = 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright';
 $aOutput['batch'] = array();
 
 foreach ($aBatchResults as $aSearchResults) {
-    if (!$aSearchResults) $aSearchResults = array();
+    if (!$aSearchResults) {
+        $aSearchResults = array();
+    }
     $aFilteredPlaces = array();
     foreach ($aSearchResults as $iResNum => $aPointDetails) {
         $aPlace = array(
                    'place_id'=>$aPointDetails['place_id'],
+                   'licence'=>$aPointDetails['licence'],
+                   'copyright'=>$aPointDetails['copyright'],
                   );
 
         $sOSMType = formatOSMType($aPointDetails['osm_type']);
diff --git a/lib/template/search-geocodejson.php b/lib/template/search-geocodejson.php
index 3e3a31c443..b92f819cc5 100644
--- a/lib/template/search-geocodejson.php
+++ b/lib/template/search-geocodejson.php
@@ -9,7 +9,14 @@
                                )
               );
 
-    if (isset($aPointDetails['place_id'])) $aPlace['properties']['geocoding']['place_id'] = $aPointDetails['place_id'];
+    if (isset($aPointDetails['place_id'])) {
+        $aPlace['properties']['geocoding']['place_id'] = $aPointDetails['place_id'];
+    }
+
+    $aPlace['properties']['geocoding']['licence'] = $aPointDetails['licence'];
+
+    $aPlace['properties']['geocoding']['copyright'] = $aPointDetails['copyright'];
+    
     $sOSMType = formatOSMType($aPointDetails['osm_type']);
     if ($sOSMType) {
         $aPlace['properties']['geocoding']['osm_type'] = $sOSMType;
@@ -48,13 +55,15 @@
 }
 
 
-javascript_renderData(array(
-                       'type' => 'FeatureCollection',
-                       'geocoding' => array(
-                                       'version' => '0.1.0',
-                                       'attribution' => 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright',
-                                       'licence' => 'ODbL',
-                                       'query' => $sQuery
+javascript_renderData(
+    array(
+     'type' => 'FeatureCollection',
+     'geocoding' => array(
+                     'version' => '0.1.0',
+                    //  'attribution' => 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright',
+                    //    'licence' => 'ODbL',
+                     'query' => $sQuery
                                       ),
-                       'features' => $aFilteredPlaces
-                      ));
+     'features' => $aFilteredPlaces
+    )
+);
diff --git a/lib/template/search-geojson.php b/lib/template/search-geojson.php
index 0847fba411..50b8e0bdf2 100644
--- a/lib/template/search-geojson.php
+++ b/lib/template/search-geojson.php
@@ -6,6 +6,8 @@
                'type' => 'Feature',
                'properties' => array(
                                 'place_id'=>$aPointDetails['place_id'],
+                                'licence'=>$aPointDetails['licence'],
+                                'copyright'=>$aPointDetails['copyright'],
                                )
               );
     
@@ -58,14 +60,19 @@
     }
 
 
-    if (isset($aPointDetails['sExtraTags'])) $aPlace['properties']['extratags'] = $aPointDetails['sExtraTags'];
-    if (isset($aPointDetails['sNameDetails'])) $aPlace['properties']['namedetails'] = $aPointDetails['sNameDetails'];
-
+    if (isset($aPointDetails['sExtraTags'])) {
+        $aPlace['properties']['extratags'] = $aPointDetails['sExtraTags'];
+    }
+    if (isset($aPointDetails['sNameDetails'])) {
+        $aPlace['properties']['namedetails'] = $aPointDetails['sNameDetails'];
+    }
     $aFilteredPlaces[] = $aPlace;
 }
 
-javascript_renderData(array(
-                       'type' => 'FeatureCollection',
-                       'licence' => 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright',
-                       'features' => $aFilteredPlaces
-                      ));
+javascript_renderData(
+    array(
+     'type' => 'FeatureCollection',
+                    //    'licence' => 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright',
+     'features' => $aFilteredPlaces
+    )
+);
diff --git a/lib/template/search-json.php b/lib/template/search-json.php
index 4b896d08a6..ab406e82d1 100644
--- a/lib/template/search-json.php
+++ b/lib/template/search-json.php
@@ -4,7 +4,9 @@
 foreach ($aSearchResults as $iResNum => $aPointDetails) {
     $aPlace = array(
                'place_id'=>$aPointDetails['place_id'],
-               'licence'=>'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright',
+            //    'licence'=>'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright',
+               'licence'=>$aPointDetails['licence'],
+               'copyright'=>$aPointDetails['copyright'],
               );
     
     $sOSMType = formatOSMType($aPointDetails['osm_type']);
@@ -60,8 +62,12 @@
         $aPlace['geokml'] = $aPointDetails['askml'];
     }
 
-    if (isset($aPointDetails['sExtraTags'])) $aPlace['extratags'] = $aPointDetails['sExtraTags'];
-    if (isset($aPointDetails['sNameDetails'])) $aPlace['namedetails'] = $aPointDetails['sNameDetails'];
+    if (isset($aPointDetails['sExtraTags'])) {
+        $aPlace['extratags'] = $aPointDetails['sExtraTags'];
+    }
+    if (isset($aPointDetails['sNameDetails'])) {
+        $aPlace['namedetails'] = $aPointDetails['sNameDetails'];
+    }
 
     $aFilteredPlaces[] = $aPlace;
 }
diff --git a/lib/template/search-xml.php b/lib/template/search-xml.php
index 68d985f3cc..8f85bac9fa 100644
--- a/lib/template/search-xml.php
+++ b/lib/template/search-xml.php
@@ -8,9 +8,11 @@
 echo '<';
 echo (isset($sXmlRootTag)?$sXmlRootTag:'searchresults');
 echo " timestamp='".date(DATE_RFC822)."'";
-echo " attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright'";
+// echo " attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright'";
 echo " querystring='".htmlspecialchars($sQuery, ENT_QUOTES)."'";
+
 if (isset($aMoreParams['viewbox'])) echo " viewbox='".htmlspecialchars($aMoreParams['viewbox'], ENT_QUOTES)."'";
+
 if (isset($aMoreParams['exclude_place_ids'])) {
     echo " exclude_place_ids='".htmlspecialchars($aMoreParams['exclude_place_ids'])."'";
 }
@@ -19,6 +21,8 @@
 
 foreach ($aSearchResults as $iResNum => $aResult) {
     echo "<place place_id='".$aResult['place_id']."'";
+    echo " licence='".$aResult['licence']."'";
+    echo " copyright='".$aResult['copyright']."'";
     $sOSMType = formatOSMType($aResult['osm_type']);
     if ($sOSMType) {
         echo " osm_type='$sOSMType'";