diff --git a/portal-2/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts b/portal-2/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
index 6fc92253..bc354c92 100644
--- a/portal-2/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
+++ b/portal-2/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
@@ -15,6 +15,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
     selector: 'advanced-search-dataprovider',
     template: `
     <advanced-search-page pageTitle="Advanced Search Data Providers" entityType="dataprovider"
+                 type = "datasources"
                  [(results)] = "results"
                  [(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap"   [(selectedFields)]="selectedFields"
                   [(searchUtils)] = "searchUtils"
diff --git a/portal-2/src/app/searchPages/advanced/advancedSearchDatasets.component.ts b/portal-2/src/app/searchPages/advanced/advancedSearchDatasets.component.ts
index 2f65fb82..948368c6 100644
--- a/portal-2/src/app/searchPages/advanced/advancedSearchDatasets.component.ts
+++ b/portal-2/src/app/searchPages/advanced/advancedSearchDatasets.component.ts
@@ -14,6 +14,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
     selector: 'advanced-search-datasets',
     template: `
     <advanced-search-page pageTitle="Advanced Search Datasets" entityType="dataset"
+                 type = "datasets"
                  [(results)] = "results"
                  [(searchUtils)] = "searchUtils"
                  [(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap"   [(selectedFields)]="selectedFields"
diff --git a/portal-2/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts b/portal-2/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
index f40f67bb..61f41048 100644
--- a/portal-2/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
+++ b/portal-2/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
@@ -13,7 +13,8 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
 @Component({
     selector: 'advanced-search-organizations',
     template: `
-    <advanced-search-page pageTitle="Advanced Search Organizations" entityType="dataset"
+    <advanced-search-page pageTitle="Advanced Search Organizations" entityType="organization"
+                 type = "organizations"
                  [(results)] = "results"
                  [(searchUtils)] = "searchUtils"
                  [(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap"   [(selectedFields)]="selectedFields"
diff --git a/portal-2/src/app/searchPages/advanced/advancedSearchPeople.component.ts b/portal-2/src/app/searchPages/advanced/advancedSearchPeople.component.ts
index 0391fb69..5e4b0ef8 100644
--- a/portal-2/src/app/searchPages/advanced/advancedSearchPeople.component.ts
+++ b/portal-2/src/app/searchPages/advanced/advancedSearchPeople.component.ts
@@ -13,7 +13,8 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
 @Component({
     selector: 'advanced-search-organizations',
     template: `
-    <advanced-search-page pageTitle="Advanced Search People" entityType="dataset"
+    <advanced-search-page pageTitle="Advanced Search People" entityType="person"
+                 type = "people"
                  [(results)] = "results"
                  [(searchUtils)] = "searchUtils"
                  [(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap"   [(selectedFields)]="selectedFields"
diff --git a/portal-2/src/app/searchPages/advanced/advancedSearchProjects.component.ts b/portal-2/src/app/searchPages/advanced/advancedSearchProjects.component.ts
index 224f0c6a..5429ce71 100644
--- a/portal-2/src/app/searchPages/advanced/advancedSearchProjects.component.ts
+++ b/portal-2/src/app/searchPages/advanced/advancedSearchProjects.component.ts
@@ -13,6 +13,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
     selector: 'advanced-search-projects',
     template: `
     <advanced-search-page pageTitle="Advanced Search Projects" entityType="project"
+                 type = "projects"
                  [(results)] = "results"
                  [(searchUtils)] = "searchUtils"
                  [(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap"   [(selectedFields)]="selectedFields"
diff --git a/portal-2/src/app/searchPages/advanced/advancedSearchPublications.component.ts b/portal-2/src/app/searchPages/advanced/advancedSearchPublications.component.ts
index 7d4cbb05..1d8cdf0e 100644
--- a/portal-2/src/app/searchPages/advanced/advancedSearchPublications.component.ts
+++ b/portal-2/src/app/searchPages/advanced/advancedSearchPublications.component.ts
@@ -14,6 +14,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
     selector: 'advanced-search-publications',
     template: `
     <advanced-search-page pageTitle="Advanced Search Publications" entityType="publication"
+                 type="publications"
                  [(results)] = "results"
                  [(searchUtils)] = "searchUtils"
                  [(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap"   [(selectedFields)]="selectedFields"
diff --git a/portal-2/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts b/portal-2/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts
index 866ea83e..4726a434 100644
--- a/portal-2/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts
+++ b/portal-2/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts
@@ -15,7 +15,7 @@ import {ExportCSVComponent} from '../../utils/exportCSV.component';
     selector: 'search-dataproviders',
     template: `
 
-    <search-page pageTitle="Compatible Dataproviders" type="datasource" [(filters)] = "filters"
+    <search-page pageTitle="Compatible Dataproviders" type="datasources" [(filters)] = "filters"
                  [(results)] = "results"  [(searchUtils)] = "searchUtils"
                   [baseUrl] = "baseUrl" [showResultCount]=false (queryChange)="queryChanged($event)"
                   (downloadClick)="downloadClicked($event)">
diff --git a/portal-2/src/app/searchPages/dataProviders/entityRegistries.component.ts b/portal-2/src/app/searchPages/dataProviders/entityRegistries.component.ts
index 22346de8..fedc865d 100644
--- a/portal-2/src/app/searchPages/dataProviders/entityRegistries.component.ts
+++ b/portal-2/src/app/searchPages/dataProviders/entityRegistries.component.ts
@@ -15,7 +15,7 @@ import {ExportCSVComponent} from '../../utils/exportCSV.component';
     selector: 'search-entity-registries',
     template: `
 
-    <search-page pageTitle="Entity Registries" type="datasource" [(filters)] = "filters"
+    <search-page pageTitle="Entity Registries" type="datasources" [(filters)] = "filters"
                  [(results)] = "results" [(searchUtils)] = "searchUtils"
                  [baseUrl] = "baseUrl" [showResultCount]=false (queryChange)="queryChanged($event)"
                  (downloadClick)="downloadClicked($event)">
diff --git a/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.ts b/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.ts
index 265fbc3c..fffd51e4 100644
--- a/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.ts
+++ b/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.ts
@@ -36,7 +36,7 @@ import {SearchUtilsClass} from './searchUtils.class';
                                           (queryChange)="queryChanged($event)">
                     </advanced-search-form>
                     <!--div class="uk-text-right" *ngIf="results  && results.length>= size"-->
-                        <search-paging [(searchUtils)] = "searchUtils"  [(results)] = "results" [(baseUrl)] = "baseURLWithParameters"    ></search-paging>
+                        <search-paging [type]="type" [(searchUtils)] = "searchUtils"  [(results)] = "results" [(baseUrl)] = "baseURLWithParameters"    ></search-paging>
 
                     <!--/div-->
                     <div>
@@ -52,6 +52,7 @@ import {SearchUtilsClass} from './searchUtils.class';
 export class AdvancedSearchPageComponent {
   @Input() pageTitle = "";
   @Input() results = [];
+  @Input() type;
   @Input() entityType;
   @Input() searchUtils:SearchUtilsClass = new SearchUtilsClass();
   @Input() fieldIds:  string[];
diff --git a/portal-2/src/app/searchPages/searchUtils/searchDownload.component.ts b/portal-2/src/app/searchPages/searchUtils/searchDownload.component.ts
index 5f44b6d2..d5d4725c 100644
--- a/portal-2/src/app/searchPages/searchUtils/searchDownload.component.ts
+++ b/portal-2/src/app/searchPages/searchUtils/searchDownload.component.ts
@@ -1,23 +1,25 @@
 import {Component, Input, Output, EventEmitter, ViewChild} from '@angular/core';
 import {Observable}       from 'rxjs/Observable';
 import {AlertModal} from '../../utils/modal/alert';
+import {OpenaireProperties} from '../../utils/properties/openaireProperties';
 
 @Component({
     selector: 'search-download',
     template: `
     <div class= "searchDownload" *ngIf="totalResults > 0">
-        <div class="uk-text-right" *ngIf="totalResults <= 100000">
-            <a (click)="download()">
+        <div class="uk-text-right" *ngIf="totalResults <= 10000">
+            <!--a (click)="download()"-->
+            <a href="{{downloadURLAPI}}publications?format=csv">
                 <span class="glyphicon glyphicon-download" aria-hidden="true"></span>
                 Download report (CSV)
             </a>
         </div>
-        <div class="uk-text-right" *ngIf="totalResults > 100000">
+        <!--div class="uk-text-right" *ngIf="totalResults > 100000">
             <a (click)="denialOfDownload()">
                 <span class="glyphicon glyphicon-download" aria-hidden="true"></span>
                 Download report (CSV)
             </a>
-        </div>
+        </div-->
     </div>
     <modal-alert></modal-alert>
 
@@ -28,12 +30,14 @@ export class SearchDownloadComponent {
     @Input() totalResults:number = 0;
     @ViewChild(AlertModal) alertApplyAll;
     @Output() downloadClick  = new EventEmitter();
+    private downloadURLAPI: string;
 
     constructor () {
-     }
+
+    }
 
     ngOnInit() {
-
+        this.downloadURLAPI = OpenaireProperties.getCsvApi();
     }
 
     confirmClose(data){
diff --git a/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts b/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts
index ca7758f3..83ecd2fd 100644
--- a/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts
+++ b/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts
@@ -41,7 +41,7 @@ import {DOI} from '../../utils/string-utils.class';
 
             <div class="uk-width-large-3-4  uk-width-medium-3-4  uk-width-small-1-1" >
               <search-download [totalResults]="searchUtils.totalResults" (downloadClick)="downloadClicked($event)"></search-download>
-              <search-paging [(searchUtils)] = "searchUtils"  [(results)] = "results"  [(baseUrl)] = "baseURLWithParameters"></search-paging>
+              <search-paging [type]="type" [(searchUtils)] = "searchUtils"  [(results)] = "results"  [(baseUrl)] = "baseURLWithParameters"></search-paging>
               <search-result [results]="results" [totalResults]="searchUtils.totalResults" [status]=searchUtils.status [page]="searchUtils.page"></search-result>
             </div>
           </div>
@@ -51,7 +51,7 @@ import {DOI} from '../../utils/string-utils.class';
         <div *ngIf="!showRefine" >
 
             <search-form [(keyword)]="searchUtils.keyword" (keywordChange)="keywordChanged($event)"></search-form>
-            <search-paging [(searchUtils)] = "searchUtils"  [(results)] = "results"   [(baseUrl)] = "baseURLWithParameters"></search-paging>
+            <search-paging [type]="type" [(searchUtils)] = "searchUtils"  [(results)] = "results"   [(baseUrl)] = "baseURLWithParameters"></search-paging>
              <search-result [results]="results" [totalResults]="searchUtils.totalResults" [status]=searchUtils.status [page]="searchUtils.page"></search-result>
 
         </div>
@@ -125,7 +125,7 @@ export class SearchPageComponent {
    var doiQuery = "";
    var keywordQuery = "";
    if((keyword && keyword.length > 0)){
-     if((this.type == 'publication' ||this.type == 'dataset')){
+     if((this.type == 'publications' ||this.type == 'datasets')){
        var DOIs:string[] = DOI.getDOIsFromString(keyword);
        var doisParams = "";
 
@@ -173,7 +173,7 @@ export class SearchPageComponent {
   var doiQuery = "";
   var keywordQuery = "";
   if((keyword && keyword.length > 0)){
-    if((this.type == 'publication' ||this.type == 'dataset')){
+    if((this.type == 'publications' ||this.type == 'datasets')){
       var DOIs:string[] = DOI.getDOIsFromString(keyword);
       var doisParams = "";
 
@@ -273,7 +273,7 @@ export class SearchPageComponent {
     var keywordQuery = "";
     console.info("keyyyyword::::"+ this.searchUtils.keyword )
     if((this.searchUtils.keyword && this.searchUtils.keyword.length > 0)){
-      if((this.type == 'publication' ||this.type == 'dataset')){
+      if((this.type == 'publications' ||this.type == 'datasets')){
         var DOIs:string[] = DOI.getDOIsFromString(this.searchUtils.keyword);
         var doisParams = "";
 
@@ -315,7 +315,7 @@ export class SearchPageComponent {
     var doiQuery = "";
     var keywordQuery = "";
     if((this.searchUtils.keyword && this.searchUtils.keyword.length > 0)){
-      if((this.type == 'publication' ||this.type == 'dataset')){
+      if((this.type == 'publications' ||this.type == 'datasets')){
         var DOIs:string[] = DOI.getDOIsFromString(this.searchUtils.keyword);
         var doisParams = "";
         for(var i =0 ;i < DOIs.length; i++){
diff --git a/portal-2/src/app/searchPages/searchUtils/searchPaging.component.ts b/portal-2/src/app/searchPages/searchUtils/searchPaging.component.ts
index 2dde1f77..ead58de6 100644
--- a/portal-2/src/app/searchPages/searchUtils/searchPaging.component.ts
+++ b/portal-2/src/app/searchPages/searchUtils/searchPaging.component.ts
@@ -9,7 +9,7 @@ import {Observable}       from 'rxjs/Observable';
             <paging [currentPage]="searchUtils.page" [totalResults]="searchUtils.totalResults"  [baseUrl]="baseUrl" [size]="searchUtils.size"> </paging>
       </div>
       <div class="" *ngIf="results  && searchUtils.totalResults > 0">
-            {{searchUtils.totalResults}} documents, page {{searchUtils.page}} of {{(totalPages())}}
+            {{searchUtils.totalResults}} {{type}}, page {{searchUtils.page}} of {{(totalPages())}}
       </div>
     </div>
     `
@@ -19,6 +19,7 @@ export class SearchPagingComponent {
     @Input() searchUtils;
     @Input() results;
     @Input() baseUrl;
+    @Input() type;
 
     // @Input() totalResults:number = 0;
     constructor () {
diff --git a/portal-2/src/app/searchPages/simple/searchDataproviders.component.ts b/portal-2/src/app/searchPages/simple/searchDataproviders.component.ts
index aa4ee076..ef099056 100644
--- a/portal-2/src/app/searchPages/simple/searchDataproviders.component.ts
+++ b/portal-2/src/app/searchPages/simple/searchDataproviders.component.ts
@@ -14,7 +14,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
     selector: 'search-dataproviders',
     template: `
 
-    <search-page pageTitle="Search Dataproviders" type="datasource" [(filters)] = "filters"
+    <search-page pageTitle="Search Dataproviders" type="datasources" [(filters)] = "filters"
                  [(results)] = "results"   [(searchUtils)] = "searchUtils" [baseUrl] = "baseUrl"
 				 (queryChange)="queryChanged($event)"  (downloadClick)="downloadClicked($event)">
     </search-page>
diff --git a/portal-2/src/app/searchPages/simple/searchDatasets.component.ts b/portal-2/src/app/searchPages/simple/searchDatasets.component.ts
index 03f6048d..54bc93bc 100644
--- a/portal-2/src/app/searchPages/simple/searchDatasets.component.ts
+++ b/portal-2/src/app/searchPages/simple/searchDatasets.component.ts
@@ -15,7 +15,7 @@ import {DOI} from '../../utils/string-utils.class';
     selector: 'search-datasets',
     template: `
 
-    <search-page pageTitle="Search Datasets" type="dataset" [(filters)] = "filters"
+    <search-page pageTitle="Search Datasets" type="datasets" [(filters)] = "filters"
                  [(results)] = "results"   [(searchUtils)] = "searchUtils"
                  [baseUrl] = "baseUrl" (queryChange)="queryChanged($event)"  >
     </search-page>
diff --git a/portal-2/src/app/searchPages/simple/searchOrganizations.component.ts b/portal-2/src/app/searchPages/simple/searchOrganizations.component.ts
index 822fb515..682a7d91 100644
--- a/portal-2/src/app/searchPages/simple/searchOrganizations.component.ts
+++ b/portal-2/src/app/searchPages/simple/searchOrganizations.component.ts
@@ -13,7 +13,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
     selector: 'search-organizations',
     template: `
 
-    <search-page pageTitle="Search Organizations" type="organization" [(filters)] = "filters"
+    <search-page pageTitle="Search Organizations" type="organizations" [(filters)] = "filters"
                  [(results)] = "results"  [(searchUtils)] = "searchUtils"
                   [baseUrl] = "baseUrl" (queryChange)="queryChanged($event)"  >
     </search-page>
diff --git a/portal-2/src/app/searchPages/simple/searchPeople.component.ts b/portal-2/src/app/searchPages/simple/searchPeople.component.ts
index 9361eba8..7ee413c1 100644
--- a/portal-2/src/app/searchPages/simple/searchPeople.component.ts
+++ b/portal-2/src/app/searchPages/simple/searchPeople.component.ts
@@ -15,7 +15,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
     selector: 'search-people',
     template: `
 
-    <search-page pageTitle="Search People" type="person" [(filters)] = "filters"
+    <search-page pageTitle="Search People" type="people" [(filters)] = "filters"
                  [(results)] = "results"
                  [(searchUtils)] = "searchUtils" [baseUrl] = "baseUrl" (queryChange)="queryChanged($event)" [showRefine]=false >
     </search-page>
diff --git a/portal-2/src/app/searchPages/simple/searchProjects.component.ts b/portal-2/src/app/searchPages/simple/searchProjects.component.ts
index 0c6d45f1..6001f4d8 100644
--- a/portal-2/src/app/searchPages/simple/searchProjects.component.ts
+++ b/portal-2/src/app/searchPages/simple/searchProjects.component.ts
@@ -13,7 +13,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
     selector: 'search-projects',
     template: `
 
-    <search-page pageTitle="Search Projects" type="project" [(filters)] = "filters"
+    <search-page pageTitle="Search Projects" type="projects" [(filters)] = "filters"
                  [(results)] = "results"
                  [(searchUtils)] = "searchUtils"
                   [baseUrl] = "baseUrl" (queryChange)="queryChanged($event)"  >
diff --git a/portal-2/src/app/searchPages/simple/searchPublications.component.ts b/portal-2/src/app/searchPages/simple/searchPublications.component.ts
index 71cfa784..b50b709f 100644
--- a/portal-2/src/app/searchPages/simple/searchPublications.component.ts
+++ b/portal-2/src/app/searchPages/simple/searchPublications.component.ts
@@ -17,7 +17,7 @@ import {DOI} from '../../utils/string-utils.class';
     selector: 'search-publications',
     template: `
 
-    <search-page pageTitle="Search Publications" type="publication" [(filters)] = "filters"
+    <search-page pageTitle="Search Publications" type="publications" [(filters)] = "filters"
                  [(results)] = "results"
                  [(searchUtils)] = "searchUtils"   [(baseUrl)] = baseUrl
                  (queryChange)="queryChanged($event)" (downloadClick)="downloadClicked($event)">
diff --git a/portal-2/src/app/utils/properties/openaireProperties.ts b/portal-2/src/app/utils/properties/openaireProperties.ts
index 7c399e91..093c97c0 100644
--- a/portal-2/src/app/utils/properties/openaireProperties.ts
+++ b/portal-2/src/app/utils/properties/openaireProperties.ts
@@ -35,24 +35,23 @@ export class OpenaireProperties {
     private static claimsAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-openaire-connector-service-1.0.0-SNAPSHOT/rest/claimsService/";
 
     // private static searchAPIURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
-    //  private static searchAPIURLLAst = "http://astero.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
-
     // private searchAPIURL     = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/";
     private static searchAPIURL     = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
 
     // private static searchAPIURLLAst     = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
-
     private static searchAPIURLLAst     = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
     //private static searchAPIURLLAst = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
 
     // private static searchResourcesAPIURL     = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/resources";
     private static searchResourcesAPIURL     = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/resources";
- 
+
     //private static searchServiveURL     = "http://astero.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/";
     private static searchServiveURL  = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/";
     // private static searchServiveURL  = "http://services.openaire.eu:8380/search/";
     //private static searchServiveURL   = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/";
 
+    private static csvServiceAPIURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";//publications?format=csv
+
     private static searchCrossrefAPIURL = "http://api.crossref.org/works";
     private static searchDataciteAPIURL = "http://search.datacite.org/api";
     private static searchOrcidURL    = "https://pub.orcid.org/";
@@ -234,6 +233,10 @@ export class OpenaireProperties {
     public static getHelpdesk():string{
         return this.helpdesk;
     }
+
+    public static getCsvApi(): string {
+        return this.csvServiceAPIURL;
+    }
 }
 export class ErrorCodes {
   public LOADING = 0;