diff --git a/explore/angular.json b/explore/angular.json
index dd429b36..37a07f8c 100644
--- a/explore/angular.json
+++ b/explore/angular.json
@@ -19,7 +19,6 @@
             "assets": [
               "src/assets",
               "src/robots.txt",
-              "src/sitemap.xml",
               {
                 "glob": "**/*",
                 "input": "src/sitemaps",
diff --git a/explore/deploy/production-properties.json b/explore/deploy/production-properties.json
index 851d3c1b..df5bcfbf 100644
--- a/explore/deploy/production-properties.json
+++ b/explore/deploy/production-properties.json
@@ -91,6 +91,6 @@
   "showLastIndexInformationLink" : true,
   "widgetLink" : "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
   "claimsInformationLink": "https://www.openaire.eu/linking",
-  "lastIndexUpdate": "2019-07-23",
+  "lastIndexUpdate": "2019-09-07",
   "indexInfoAPI": "http://services.openaire.eu/openaire/info/"
 }
diff --git a/explore/deploy/test-properties.json b/explore/deploy/test-properties.json
index eab42e37..a8230ff9 100644
--- a/explore/deploy/test-properties.json
+++ b/explore/deploy/test-properties.json
@@ -37,6 +37,7 @@
   "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",
   "piwikSiteId" : "109",
   "loginUrl" :"https://services.openaire.eu/uoa-user-management/openid_connect_login",
+  "userInfoUrl" : " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
 
   "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
 
@@ -93,6 +94,6 @@
   "showLastIndexInformationLink" : false,
   "widgetLink" : "https://test.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
   "claimsInformationLink": "https://www.openaire.eu/linking",
-  "lastIndexUpdate": "2019-07-23",
+  "lastIndexUpdate": "2019-09-07",
   "indexInfoAPI": "http://services.openaire.eu/openaire/info/"
 }
diff --git a/explore/src/assets/env-properties.json b/explore/src/assets/env-properties.json
index 5a878bd0..f3cc1cfc 100644
--- a/explore/src/assets/env-properties.json
+++ b/explore/src/assets/env-properties.json
@@ -1,7 +1,7 @@
 {
   "environment" : "development",
   "enablePiwikTrack" : false,
-  "useCache" : false,
+  "useCache" : true,
   "metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
   "framesAPIURL" : "https://beta.openaire.eu/stats3/",
   "statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats/",
diff --git a/explore/src/robots.txt b/explore/src/robots.txt
index ab79bb20..59f34148 100644
--- a/explore/src/robots.txt
+++ b/explore/src/robots.txt
@@ -5,14 +5,28 @@ Disallow: /participate/direct-claim
 Disallow: /myclaims
 Disallow: /claims
 
-Disallow: /search/dataset
-Disallow: /search/other
-Disallow: /search/project
-Disallow: /search/dataprovider
-Disallow: /search/organization
-Disallow: /search/project-report
+Disallow: /search/dataset?datasetId=*
+Disallow: /search/other?orpId=*
+Disallow: /search/project?projectId=*
+Disallow: /search/dataprovider?datasourceId=*
+Disallow: /search/organization?organizationId=*
+Disallow: /project-report?projectId=*
+
+Disallow: /search/find/datasets/
+Disallow: /search/find/other/
+Disallow: /search/find/projects/
+Disallow: /search/find/dataproviders/
+Disallow: /search/find/organizations/
+
+Disallow: /search/advanced/datasets/
+Disallow: /search/advanced/other/
+Disallow: /search/advanced/projects/
+Disallow: /search/advanced/dataproviders/
+Disallow: /search/advanced/organizations/
 
 #Disallow: /
 
 Sitemap: https://explore.openaire.eu/sitemap.xml
+Sitemap: https://explore.openaire.eu/publicationSitemap.xml
+Sitemap: https://explore.openaire.eu/softwareSitemap.xml
 
diff --git a/explore/src/sitemap.xml b/explore/src/sitemap.xml
index 1d71a60c..92553e19 100644
--- a/explore/src/sitemap.xml
+++ b/explore/src/sitemap.xml
@@ -5,11 +5,6 @@
       <changefreq>weekly</changefreq>
       <priority>1</priority>
    </url>
-   <url>
-      <loc><![CDATA[https://explore.openaire.eu/participate/claim]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.9</priority>
-   </url>
    <url>
       <loc><![CDATA[https://explore.openaire.eu/search/find]]></loc>
       <changefreq>daily</changefreq>
diff --git a/explore/src/sitemaps/sitemap.xml b/explore/src/sitemaps/sitemap.xml
new file mode 100644
index 00000000..6cc29ed8
--- /dev/null
+++ b/explore/src/sitemaps/sitemap.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
+   <url>
+      <loc><![CDATA[https://explore.openaire.eu]]></loc>
+      <changefreq>weekly</changefreq>
+      <priority>1</priority>
+   </url>
+   <url>
+      <loc><![CDATA[https://explore.openaire.eu/search/find]]></loc>
+      <changefreq>daily</changefreq>
+      <priority>1</priority>
+   </url>
+   <url>
+      <loc><![CDATA[https://explore.openaire.eu/search/find/publications]]></loc>
+      <changefreq>daily</changefreq>
+      <priority>0.9</priority>
+   </url>
+   <url>
+      <loc><![CDATA[https://explore.openaire.eu/search/find/software]]></loc>
+      <changefreq>daily</changefreq>
+      <priority>0.9</priority>
+   </url>
+   <url>
+      <loc><![CDATA[https://explore.openaire.eu/search/advanced/publications]]></loc>
+      <changefreq>daily</changefreq>
+      <priority>0.8</priority>
+   </url>
+   <url>
+      <loc><![CDATA[https://explore.openaire.eu/search/advanced/software]]></loc>
+      <changefreq>daily</changefreq>
+      <priority>0.8</priority>
+   </url>
+
+   <url>
+      <loc><![CDATA[https://explore.openaire.eu/search/content-providers]]></loc>
+      <changefreq>weekly</changefreq>
+      <priority>0.7</priority>
+   </url>
+   <url>
+      <loc><![CDATA[https://explore.openaire.eu/search/entity-registries]]></loc>
+      <changefreq>weekly</changefreq>
+      <priority>0.7</priority>
+   </url>
+   <url>
+      <loc><![CDATA[https://explore.openaire.eu/search/journals]]></loc>
+      <changefreq>weekly</changefreq>
+      <priority>0.7</priority>
+   </url>
+   <url>
+      <loc><![CDATA[https://explore.openaire.eu/participate/deposit-publications]]></loc>
+      <changefreq>weekly</changefreq>
+      <priority>0.8</priority>
+   </url>
+   <url>
+      <loc><![CDATA[https://explore.openaire.eu/participate/deposit-datasets]]></loc>
+      <changefreq>weekly</changefreq>
+      <priority>0.8</priority>
+   </url>
+</urlset>