diff --git a/src/app/pages/continentoverview/continent-overview.component.html b/src/app/pages/continentoverview/continent-overview.component.html
index 60471fd1e..9fcce4ead 100644
--- a/src/app/pages/continentoverview/continent-overview.component.html
+++ b/src/app/pages/continentoverview/continent-overview.component.html
@@ -755,7 +755,7 @@
 
                       <div class="uk-margin-top uk-margin-bottom">
                         <label class="uk-margin-right">Show: </label>
-                        <select class="md-input" #selectContent (change)="getContent('publication', selectContent.value)" style="width: 230px; display: inline-block">
+                        <select class="md-input" #selectPublicationsContent (change)="getContent('publication', selectPublicationsContent.value)" style="width: 230px; display: inline-block">
                           <option value="affiliated">affiliated</option>
                           <option value="affiliated_peer_reviewed">affiliated peer reviewed</option>
                           <option value="deposited">deposited</option>
@@ -784,11 +784,11 @@
 
                               <ul id="pubs-indicators-content-a-fade" class="uk-switcher uk-margin" >
                                 <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
-                                  <!--<div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>-->
+                                  <div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>
                                   <app-countries-table *ngIf="publicationsAbsoluteTableData" [isPercentage]="false" [countries]="publicationsAbsoluteTableData" [view]="'openScience'" [entity]="'publication'"></app-countries-table>
                                 </li>
                                 <li aria-hidden="true" style="animation-duration: 200ms;" class="">
-                                  <!--<div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>-->
+                                  <div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>
                                   <app-countries-table *ngIf="publicationsPercentageTableData" [isPercentage]="true" [countries]="publicationsPercentageTableData" [view]="'openScience'" [entity]="'publication'"></app-countries-table>
                                 </li>
                               </ul>
@@ -912,7 +912,7 @@
 
                       <div class="uk-margin-top uk-margin-bottom">
                         <label class="uk-margin-right">Show: </label>
-                        <select class="md-input" #selectContent (change)="getContent('dataset', selectContent.value)" style="width: 230px; display: inline-block">
+                        <select class="md-input" #selectDatasetsContent (change)="getContent('dataset', selectDatasetsContent.value)" style="width: 230px; display: inline-block">
                           <option value="affiliated">affiliated</option>
                           <option value="affiliated_peer_reviewed">affiliated peer reviewed</option>
                           <option value="deposited">deposited</option>
@@ -941,11 +941,11 @@
 
                               <ul id="data-indicators-content-a-fade" class="uk-switcher uk-margin" >
                                 <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
-                                  <!--<div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>-->
+                                  <div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>
                                   <app-countries-table *ngIf="datasetsAbsoluteTableData" [isPercentage]="false" [countries]="datasetsAbsoluteTableData" [view]="'openScience'" [entity]="'dataset'"></app-countries-table>
                                 </li>
                                 <li aria-hidden="true" style="animation-duration: 200ms;" class="">
-                                  <!--<div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>-->
+                                  <div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>
                                   <app-countries-table *ngIf="datasetsPercentageTableData" [isPercentage]="true" [countries]="datasetsPercentageTableData" [view]="'openScience'" [entity]="'dataset'"></app-countries-table>
                                 </li>
                               </ul>
@@ -1069,7 +1069,7 @@
 
                       <div class="uk-margin-top uk-margin-bottom">
                         <label class="uk-margin-right">Show: </label>
-                        <select class="md-input" #selectContent (change)="getContent('software', selectContent.value)" style="width: 230px; display: inline-block">
+                        <select class="md-input" #selectSoftwareContent (change)="getContent('software', selectSoftwareContent.value)" style="width: 230px; display: inline-block">
                           <option value="affiliated">affiliated</option>
                           <option value="affiliated_peer_reviewed">affiliated peer reviewed</option>
                           <option value="deposited">deposited</option>
@@ -1098,11 +1098,11 @@
 
                               <ul id="software-indicators-content-a-fade" class="uk-switcher uk-margin" >
                                 <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
-                                  <!--<div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>-->
+                                  <div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>
                                   <app-countries-table *ngIf="softwareAbsoluteTableData" [isPercentage]="false" [countries]="softwareAbsoluteTableData" [view]="'openScience'" [entity]="'software'"></app-countries-table>
                                 </li>
                                 <li aria-hidden="true" style="animation-duration: 200ms;" class="">
-                                  <!--<div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>-->
+                                  <div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>
                                   <app-countries-table *ngIf="softwarePercentageTableData" [isPercentage]="true" [countries]="softwarePercentageTableData" [view]="'openScience'" [entity]="'software'"></app-countries-table>
                                 </li>
                               </ul>
@@ -1226,7 +1226,7 @@
 
                       <div class="uk-margin-top uk-margin-bottom">
                         <label class="uk-margin-right">Show: </label>
-                        <select class="md-input" #selectContent (change)="getContent('other', selectContent.value)" style="width: 230px; display: inline-block">
+                        <select class="md-input" #selectOtherContent (change)="getContent('other', selectOtherContent.value)" style="width: 230px; display: inline-block">
                           <option value="affiliated">affiliated</option>
                           <option value="affiliated_peer_reviewed">affiliated peer reviewed</option>
                           <option value="deposited">deposited</option>
@@ -1255,11 +1255,11 @@
 
                               <ul id="other-indicators-content-a-fade" class="uk-switcher uk-margin" >
                                 <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
-                                  <!--<div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>-->
+                                  <div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>
                                   <app-countries-table *ngIf="otherAbsoluteTableData" [isPercentage]="false" [countries]="otherAbsoluteTableData" [view]="'openScience'" [entity]="'other'"></app-countries-table>
                                 </li>
                                 <li aria-hidden="true" style="animation-duration: 200ms;" class="">
-                                  <!--<div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>-->
+                                  <div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>
                                   <app-countries-table *ngIf="otherPercentageTableData" [isPercentage]="true" [countries]="otherPercentageTableData" [view]="'openScience'" [entity]="'other'"></app-countries-table>
                                 </li>
                               </ul>
diff --git a/src/app/pages/continentoverview/continent-overview.component.ts b/src/app/pages/continentoverview/continent-overview.component.ts
index 4ad188faf..fcaa71045 100644
--- a/src/app/pages/continentoverview/continent-overview.component.ts
+++ b/src/app/pages/continentoverview/continent-overview.component.ts
@@ -531,6 +531,7 @@ export class ContinentOverviewComponent implements OnInit {
   }
 
   getPublicationsTableData(contentSelection: string) {
+
     this.loadingPublicationsAbsoluteTable = true;
     this.loadingPublicationsPercentageTable = true;
     this.dataService.getIndicatorsTableData('publication', contentSelection).subscribe(
diff --git a/src/app/pages/countrypage/country-page.component.html b/src/app/pages/countrypage/country-page.component.html
index 42e5a4e6d..6367ec7e3 100644
--- a/src/app/pages/countrypage/country-page.component.html
+++ b/src/app/pages/countrypage/country-page.component.html
@@ -27,7 +27,7 @@
                   </div>
                 </div>
 
-                // TODO uncomment when implemented
+                <!-- TODO uncomment when implemented -->
                 <!--<div class="actionButtonsCountryPage uk-text-right">-->
                   <!--<a class=""><i class="fas fa-code uk-margin-small-right"></i>Embed</a>-->
                   <!--&lt;!&ndash;<a class="uk-margin-left"><i class="fas fa-download uk-margin-small-right"></i>Download CSV</a>&ndash;&gt;-->
@@ -169,8 +169,8 @@
                             <img src="../../../assets/img/icons/repositories-icon.svg" width="43" height="40">
                           </div>
                           <h3 class="uk-margin-remove">
-                            <span *ngIf="!countryPageOverviewData || !countryPageOverviewData.repositories || !countryPageOverviewData.repositories.oa" class="number">--</span>
-                            <span *ngIf="countryPageOverviewData?.repositories?.oa" class="number">{{countryPageOverviewData.repositories.oa | number}}</span>
+                            <span *ngIf="!countryPageOverviewData || !countryPageOverviewData.repositories || !countryPageOverviewData.repositories.total" class="number">--</span>
+                            <span *ngIf="countryPageOverviewData?.repositories?.total" class="number">{{countryPageOverviewData.repositories.total | number}}</span>
                           </h3>
                         </div>
                         <div class="uk-margin-top">
@@ -192,8 +192,8 @@
                             <img src="../../../assets/img/icons/journals-icon.svg" width="43" height="40">
                           </div>
                           <h3 class="uk-margin-remove">
-                            <span *ngIf="!countryPageOverviewData || !countryPageOverviewData.journals || !countryPageOverviewData.journals.oa" class="number">--</span>
-                            <span *ngIf="countryPageOverviewData?.journals?.oa" class="number">{{countryPageOverviewData.journals.oa | number}}</span>
+                            <span *ngIf="!countryPageOverviewData || !countryPageOverviewData.journals || !countryPageOverviewData.journals.total" class="number">--</span>
+                            <span *ngIf="countryPageOverviewData?.journals?.total" class="number">{{countryPageOverviewData.journals.total | number}}</span>
                             <!--<span *ngIf="overviewData.overview.journals?.oa" class="number">{{overviewData.overview.journals.oa | number}}</span>-->
                             <!--<span *ngIf="!overviewData.overview.journals || !overviewData.overview.journals.oa" class="number">--</span>-->
                           </h3>
diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html
index 4a87e0fd4..99bb50774 100644
--- a/src/app/pages/home/home.component.html
+++ b/src/app/pages/home/home.component.html
@@ -205,8 +205,8 @@
                       <img src="../../../assets/img/icons/repositories-icon.svg" width="43" height="40">
                     </div>
                     <h3 class="uk-margin-remove">
-                      <span *ngIf="europeOverviewData.repositories?.oa" class="number">{{europeOverviewData.repositories.oa | number}}</span>
-                      <span *ngIf="!europeOverviewData.repositories || !europeOverviewData.repositories.oa" class="number">--</span>
+                      <span *ngIf="europeOverviewData.repositories?.total" class="number">{{europeOverviewData.repositories.total | number}}</span>
+                      <span *ngIf="!europeOverviewData.repositories || !europeOverviewData.repositories.total" class="number">--</span>
                     </h3>
                   </div>
                   <div class="uk-margin-top">
@@ -229,8 +229,8 @@
                       <img src="../../../assets/img/icons/journals-icon.svg" width="43" height="40">
                     </div>
                     <h3 class="uk-margin-remove">
-                      <span *ngIf="europeOverviewData.journals?.oa" class="number">{{europeOverviewData.journals.oa | number}}</span>
-                      <span *ngIf="!europeOverviewData.journals || !europeOverviewData.journals.oa" class="number">--</span>
+                      <span *ngIf="europeOverviewData.journals?.total" class="number">{{europeOverviewData.journals.total | number}}</span>
+                      <span *ngIf="!europeOverviewData.journals || !europeOverviewData.journals.total" class="number">--</span>
                     </h3>
                   </div>
                   <div class="uk-margin-top">
@@ -397,9 +397,9 @@
               <img src="../../../assets/img/icons/repositories-icon.svg" width="30" height="30">
             </div>
             <div class="uk-width-2-5">
-              <div *ngIf="europeOverviewData.repositories?.oa" class="number big">{{europeOverviewData.repositories.oa | number}}</div>
-              <div *ngIf="!europeOverviewData.repositories || !europeOverviewData.repositories.oa" class="number big">--</div>
-              <div class="uk-margin-small-top">VALIDATED REPOSITORIES</div>
+              <div *ngIf="europeOverviewData.repositories?.total" class="number big">{{europeOverviewData.repositories.total | number}}</div>
+              <div *ngIf="!europeOverviewData.repositories || !europeOverviewData.repositories.total" class="number big">--</div>
+              <div class="uk-margin-small-top">REPOSITORIES FROM OPENDOAR & RE3DATA</div>
             </div>
             <div *ngIf="europeOverviewData.repositories?.percentage" class="uk-width-2-5">
               <div class="progress">
@@ -416,9 +416,9 @@
               <img src="../../../assets/img/icons/journals-icon.svg" width="30" height="30">
             </div>
             <div class="uk-width-2-5">
-              <div *ngIf="europeOverviewData.journals?.oa" class="number big">{{europeOverviewData.journals.oa | number}}</div>
-              <div *ngIf="!europeOverviewData.journals || !europeOverviewData.journals.oa" class="number big">--</div>
-              <div class="uk-margin-small-top">VALIDATED JOURNALS</div>
+              <div *ngIf="europeOverviewData.journals?.total" class="number big">{{europeOverviewData.journals.total | number}}</div>
+              <div *ngIf="!europeOverviewData.journals || !europeOverviewData.journals.total" class="number big">--</div>
+              <div class="uk-margin-small-top">JOURNALS FROM DOAJ</div>
             </div>
             <div *ngIf="europeOverviewData.journals?.percentage" class="uk-width-2-5">
               <div class="progress">
diff --git a/src/app/services/data.service.ts b/src/app/services/data.service.ts
index ef9b33b32..6cebcf9af 100644
--- a/src/app/services/data.service.ts
+++ b/src/app/services/data.service.ts
@@ -129,6 +129,7 @@ export class DataService {
   }
 
   public getIndicatorsTableData(type: string, content: string): Observable<RawData> {
+
     let indicatorsTableDataQuery = '';
     if (content === 'affiliated') {
       indicatorsTableDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.pid_percentage.affiliated.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.licence_percentage.affiliated.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.green_percentage.affiliated.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.gold_percentage.affiliated.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D';