[Trunk]

Home: remove explore related parts leave only search form update with more numbers Remove Search for Content providers (Journals, registries, compatible) Search: use custom filter to filter results git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-aggregator-portal/trunk@55723 d315682c-612b-4755-9ff5-7f18f6832af3
2019-05-24 13:54:22 +00:00 · 2019-05-24 13:54:22 +00:00 · f773e0ca7e
parent 19bbb42785
commit f773e0ca7e
43 changed files with 437 additions and 868 deletions
--- a/deploy/beta-properties.json
+++ b/deploy/beta-properties.json
@ -1,7 +1,7 @@
 {
  "environment" : "beta",
-  "enablePiwikTrack" : true,
-  "enableHelper" : true,
+  "enablePiwikTrack" : false,
+  "enableHelper" : false,
  "useCache" : true,
  "metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
  "framesAPIURL" : "https://beta.openaire.eu/stats3/",
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@ -16,7 +16,9 @@ const routes: Routes = [
  { path: 'search/project', loadChildren: './landingPages/project/libProject.module#LibProjectModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
  { path: 'search/dataprovider', loadChildren: '././landingPages/dataProvider/libDataProvider.module#LibDataProviderModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
  { path: 'search/organization', loadChildren: './landingPages/organization/libOrganization.module#LibOrganizationModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
-  { path: 'search/find', loadChildren: './searchPages/find/libSearch.module#LibMainSearchModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: ':id/search/find', loadChildren: './searchPages/find/libSearch.module#LibMainSearchModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/find',  loadChildren: './searchPages/find/libSearch.module#LibMainSearchModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+
  { path: 'search/find/publications', loadChildren: './searchPages/simple/searchPublications.module#LibSearchPublicationsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
  { path: 'search/find/datasets', loadChildren: './searchPages/simple/searchDatasets.module#LibSearchDatasetsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
  { path: 'search/find/software', loadChildren: './searchPages/simple/searchSoftware.module#LibSearchSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@ -17,14 +17,13 @@ import {HelperFunctions} from "./openaireLibrary/utils/HelperFunctions.class";
    <navbar *ngIf="properties" portal="aggregator" [environment]=properties.environment [onlyTop]=false
            [communityId]="properties.adminToolsCommunity" [menuItems]=menuItems
            [APIUrl]="properties.adminToolsAPIURL" [logInUrl]="properties.loginUrl"
-            [logOutUrl]="properties.logoutUrl" [cookieDomain]="properties.cookieDomain" [userMenu]="false"></navbar>
+            [logOutUrl]="properties.logoutUrl" [cookieDomain]="properties.cookieDomain" [userMenu]="false" [community]="community" [showCommunityName]="true"></navbar>
    <div class="custom-main-content">
      <main>
        <router-outlet></router-outlet>
      </main>
    </div>
-    <feedback *ngIf="isClient && properties" portalName="Explore" [feedbackmail]=feedbackmail></feedback>
-    <cookie-law *ngIf="isClient" position="bottom">
+     <cookie-law *ngIf="isClient" position="bottom">
      OpenAIRE uses cookies in order to function properly.<br>
      Cookies are small pieces of data that websites store in your browser to allow us to give you the best browsing
      experience possible.
@ -49,15 +48,15 @@ export class AppComponent {
        new MenuItem("", "Research Data", "", "/search/find/datasets", false, ["dataset"], ["/search/find/datasets"], {}),
        new MenuItem("", "Software", "", "/search/find/software", false, ["software"], ["/search/find/software"], {}),
        new MenuItem("", "Other Research Products", "", "/search/find/other", false, ["orp"], ["/search/find/other"], {}),
-        new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}),
-        new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}),
+        // new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}),
+        // new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}),
        new MenuItem("", "Organizations", "", "/search/find/organizations/", false, ["organization"], ["/search/find/organizations"], {})
      ]
    }
  ];
+  community = {id: "CA", name: "Canada Aggregator", logoUrl:"assets/common-assets/logo-small-aggregator.png"};


-  feedbackmail: string
  properties: EnvProperties;

  constructor(private  route: ActivatedRoute, private propertiesService: EnvironmentSpecificService,
@ -83,17 +82,6 @@ export class AppComponent {
      .then(es => {
        this.propertiesService.setEnvProperties(es);
        this.properties = this.propertiesService.envSpecific;
-        this.feedbackmail = this.properties.feedbackmail;
-        // if (Session.isPortalAdministrator()) {
-        //   this.userMenuItems.push(new MenuItem("", "Manage all links", "", "/claims", false, [], ["/claims"], {}));
-        //   this.userMenuItems.push(new MenuItem("", "Manage helptexts",
-        //     ((this.properties.environment == "beta") ? "https://beta.admin.connect.openaire.eu" : "https://admin.explore.openaire.eu") + "/dashboard?communityId=openaire", "", true, [], [], {}))
-        //
-        // } else if (Session.isClaimsCurator()) {
-        //   this.userMenuItems.push(new MenuItem("", "Manage all links", "", "/claims", false, [], ["/claims"], {}));
-        //
-        // }
-        //console.log(this.properties.loginUrl);
      }, error => {
        console.log("App couldn't fetch properties");
        console.log(error);
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@ -12,7 +12,7 @@
               <div class="search_box_bg uk-grid-large uk-flex-middle uk-grid uk-grid-stack" uk-grid="">
                  <div class="uk-width-1-1@m uk-first-column">
                     <div data-id="page#4">
-                     <search-form   placeholderText="Search in OpenAIRE for scholarly works" link="/search/find"></search-form>
+                     <search-form   placeholderText="Search for scholarly works" link="/search/find"></search-form>
                     </div>
                  </div>
               </div>
@ -22,14 +22,22 @@
                  <div class="uk-width-1-1@m uk-first-column">
                    <div id="page#7" class="firstPageNumbers uk-margin uk-margin-remove-bottom uk-width-xlarge uk-margin-auto  uk-animation-fade" uk-scrollspy-class="" style="">
                      <h2>
-                      <span *ngIf="showPublications && publicationsSize" >{{publicationsSize.number|number}} {{publicationsSize.size}} publications{{((showDatasets && datasetsSize)?",":"")}} </span>
-                       <span *ngIf="showDatasets && datasetsSize">{{datasetsSize.number|number}} {{datasetsSize.size}} research data  </span>
+                        Search for more than
+                      <span *ngIf="showPublications && publicationsSize" >{{publicationsSize.number|number}}
+                        {{publicationsSize.size}} publications{{((showDatasets||showSoftware||showOrp)?",":"")}} </span>
+                       <span *ngIf="showDatasets && datasetsSize">{{datasetsSize.number|number}}
+                         {{datasetsSize.size}} research data{{((showSoftware ||showOrp)?",":"")}}  </span>
+                        <span *ngIf="showSoftware && softwareSize">{{softwareSize.number|number}}
+                          {{softwareSize.size}} software{{(showOrp?",":"")}}   </span>
+                        <span *ngIf="showOrp && otherSize">{{otherSize.number|number}}
+                          {{otherSize.size}} other research products </span>
                       <br>
-                       <span *ngIf="showDataProviders && datasourcesSize" > from {{datasourcesSize.number |number}} {{datasourcesSize.size}} content providers</span>
+                        <span *ngIf="showOrganizations && organizationsSize" > from {{organizationsSize.number |number}}
+                          {{organizationsSize.size}} organizations</span>
+
+                        <span *ngIf="showDataProviders && datasourcesSize" > from {{datasourcesSize.number |number}} {{datasourcesSize.size}} content providers</span>
                       <span  *ngIf="showProjects && fundersSize"> {{((showDataProviders && datasourcesSize)?" and ":" from ")}} {{fundersSize.number|number}} {{fundersSize.size}} funders</span>
-                       <span *ngIf = "showPublications || showDatasets || showProjects || showDataProviders"  >
-                         linked together for an integrated research search
-                       </span>
+
                     </h2>
                    </div>

@ -46,7 +54,7 @@
                  name="OpenAIRE Explore"></schema2jsonld>


- <div class=" uk-section uk-section-small">
+ <!--<div class=" uk-section uk-section-small">
    <div class="uk-container uk-container-small">
       <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
          <div class="uk-width-1-1@m uk-first-column">
@ -111,9 +119,9 @@
          </div>
       </div>
    </div>
- </div>
+ </div>-->

- <div class="uk-section-muted uk-section uk-section-small">
+ <!--<div class="uk-section-muted uk-section uk-section-small">
     <div class="uk-container uk-container-large">
       <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
         <div class="uk-width-1-1@m uk-first-column">
@ -155,14 +163,14 @@
                <div class="uk-grid uk-margin-medium-top">

                  <div class="uk-width-expand@m">
-                    <!-- <div class="uk-grid uk-child-width-1-2@m"> -->
+                    &lt;!&ndash; <div class="uk-grid uk-child-width-1-2@m"> &ndash;&gt;
                      <p *ngIf="showPublications && publicationsSize">
                        <span class="emphasis portal-color">{{publicationsSize.count|number}} </span><span class="uk-text-uppercase"> publications</span>
                      </p>
                      <p  *ngIf="showDatasets && datasetsSize">
                        <span class="emphasis portal-color">{{datasetsSize.count|number}} </span><span class="uk-text-uppercase"> research data</span>
                      </p>
-                    <!-- </div> -->
+                    &lt;!&ndash; </div> &ndash;&gt;



@ -186,13 +194,13 @@
                      <span class="uk-text-uppercase">Projects</span>
                    </p>
                  </div>
-                  <!-- <div class="uk-grid uk-child-width-1-2@m uk-margin-small-top">
+                  &lt;!&ndash; <div class="uk-grid uk-child-width-1-2@m uk-margin-small-top">

                    <p *ngIf="showProjects && projectsSize">
                      <span class=" emphasis ">{{projectsSize.count|number}} </span><br>
                      <span class="uk-text-uppercase">Projects</span>
                    </p>
-                  </div> -->
+                  </div> &ndash;&gt;



@ -236,192 +244,12 @@
            </div>
          </div>
        </div>
-      </div>
-<!-- <div class="uk-section-default uk-section">
-   <div class="uk-container">
-      <div class="uk-grid-small uk-margin-medium uk-grid" uk-grid=""> -->
+      </div>-->

-
-
-
-
-
-
-         <!--div class="uk-width-expand@m uk-first-column">
-            <h5 class="searchFilterTitle">
-               <span>New content providers</span>
-            </h5>
-            <div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid=""-->
-              <!-- <errorMessages [status]="[fetchDataproviders.searchUtils.status]" [type]="'content providers'"></errorMessages>
-
-              <div *ngIf="fetchDataproviders.searchUtils.totalResults > 0">
-                  <ul [class]="'uk-list uk-list-divider  uk-margin '+custom_class">
-                     <li *ngFor="let result of fetchDataproviders.results" class="uk-animation-fade">
-                         <h4  [title] = result.title.accessMode >
-                             <a [queryParams]="routerHelper.createQueryParam(urlParam,result.id)" routerLinkActive="router-link-active" routerLink="/search/{{type}}">
-                               <p *ngIf="result['title'].name || result.acronym"><span *ngIf="result.acronym">{{result.acronym}}</span><span *ngIf="result.acronym && result['title'].name">-</span><span *ngIf="result['title'].name" [innerHTML]="result['title'].name"></span><span *ngIf="result.code">({{result.code}})</span></p>
-                               <p *ngIf="!result['title'].name && !result.acronym">[no title available]<span *ngIf="result.code">({{result.code}})</span></p>
-                             </a>
-                         </h4>
-                         <span *ngIf="result.types && result.types.length > 0" [class]="'uk-label custom-label label-blue label-'+result.entityType" title="Type">{{result.types.join(", ")}}</span>
-                         <span *ngIf="result.languages && result.languages.length > 0" class="uk-label custom-label  label-language " title="Language">{{result.languages.join(", ")}}</span>
-                         <span *ngIf="result.title && result.title.accessMode" [class]="'uk-label custom-label  label-'+ result.title.accessMode " title="Access Mode">{{result.title.accessMode}}</span>
-
-                         <span *ngIf="result['funderShortname']" class="uk-label custom-label label-funder " title="Funder">{{result['funderShortname']}}></span>
-                         <span *ngIf="result.openAccessMandate != undefined && result.openAccessMandate " class="uk-label custom-label label-openaccessmandate " title="Open Access mandate">Open Access mandate</span>
-
-                         <span *ngIf="result['type'] != undefined && result['type'] != ''" class="uk-label custom-label label-blue label-dataprovider" title="Type"> {{result['type']}}</span>
-                         <span *ngIf="result['compatibility'] != undefined && result['compatibility'] != ''" class="uk-label custom-label  label-compatibility" title="Compatibility">{{result.compatibility}}</span>
-
-                         <div *ngIf="showOrganizations && result['organizations'] != undefined && result['organizations'].length > 0">
-                             <span> Organization: </span>
-                             <span *ngFor="let organization of result['organizations'].slice(0,10) let i=index">
-                                 <a *ngIf="organization.id" [queryParams]="{organizationId: organization.id}" routerLinkActive="router-link-active" routerLink="/search/organization">
-                                         {{organization.name}}</a><span
-
-                                     *ngIf="!organization.id">
-                                         {{organization.name}}</span><span
-
-                                     *ngIf="(i < result['organizations'].length-1) && (i < 9)">,</span>
-                             </span>
-                             <span *ngIf="result['organizations'].length > 10">...</span>
-                         </div>
-
-                         <div *ngIf="result['countries'] && result['countries'].length > 0">
-                             Country: <span *ngFor="let country of  result['countries'].slice(0,10) let i = index">{{country}}{{(i < ( result['countries'].slice(0,10).length-1))?", ":""}}{{(i ==  result['countries'].slice(0,10).length-1 &&  result['countries'].length > 10)?"...":""}}</span>
-                         </div>
-                         <div *ngIf="result['websiteURL'] != undefined && result['websiteURL'] != ''">
-                             <span>Website URL: </span>
-                             <span>
-                                 <a href="{{result['websiteURL']}}" target="_blank" class="custom-external custom-icon">
-                                     {{result['websiteURL']}}
-                                 </a>
-                             </span>
-                         </div>
-                         <div *ngIf="result['OAIPMHURL'] != undefined && result['OAIPMHURL'] != ''">
-                             <span>OAI-PMH URL: </span>
-                             <span>
-                                 <a href="{{result['OAIPMHURL']}}" target="_blank" class="custom-external custom-icon">
-                                     {{result['OAIPMHURL']}}
-                                 </a>
-                             </span>
-                         </div>
-
-
-                     </li>
-                 </ul>
-
-              </div> -->
-               <!--div class="uk-first-column">
-                  <div class="el-item uk-panel">
-                     <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom portal-color">
-                        Aaltodoc Publication Archive
-                     </h6>
-                     <div class="el-meta uk-margin uk-text-meta">Aalto University</div>
-                     <div class="el-content uk-margin"><span class="uk-label label-grey">IR</span>&nbsp;<span class=" uk-label label-grey">Data</span>&nbsp;<span class="uk-label label-grey">OpenAIRE 3.0</span><br>
-                        12469 datasets
-                     </div>
-                  </div>
-               </div>
-               <div class="uk-grid-margin uk-first-column">
-                  <div class="el-item uk-panel">
-                     <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom  portal-color">
-                        Cambridge Server
-                     </h6>
-                     <div class="el-meta uk-margin uk-text-meta">Cambridge Uviversity</div>
-                     <div class="el-content uk-margin"><span class="uk-label label-grey">IR</span>&nbsp;<span class=" uk-label label-grey">Literature</span>&nbsp;<span class="uk-label label-grey"  >OpenAIRE 2.0</span><br>
-                        4567 publications
-                     </div>
-                  </div>
-               </div>
-            </div>
-            <hr>
-            <div class="uk-margin">
-               <a class=""   routerLinkActive="uk-link" routerLink="/search/find/dataproviders" >
-               View all
-               </a>
-            </div>
-         </div>
-         <div class="uk-width-expand@m">
-            <h5 class="searchFilterTitle">
-               <span>New funders</span>
-            </h5>
-            <div class="uk-margin uk-text-meta">
-               Latest funding database incorporated in OpenAIRE
-            </div>
-            <div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
-               <div class="uk-first-column">
-                  <div class="el-item uk-panel">
-                     <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom  portal-color">
-                        Swiss National Science Foundation
-                     </h6>
-                     <div class="el-meta uk-margin uk-text-meta">Switzerland</div>
-                     <div class="el-content uk-margin"><span class="uk-label label-grey">OA mandate</span><br> 47.509 publications</div>
-                  </div>
-               </div>
-               <div class="uk-grid-margin uk-first-column">
-                  <div class="el-item uk-panel">
-                     <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom  portal-color">
-                        Ministry of Education, Science and Technological Development of Republic of Serbia
-                     </h6>
-                     <div class="el-meta uk-margin uk-text-meta">Serbia</div>
-                     <div class="el-content uk-margin">7.942 publicatios</div>
-                  </div>
-               </div>
-            </div>
-         </div-->
-         <!-- <div class="uk-width-medium uk-grid-item-match">
-
-
-            <div class="uk-tile-secondary uk-tile uk-tile-xsmall portal-box"  >
-             <h3 class="uk-margin-remove-top  ">
-                Our data policies
-             </h3>
-             <ul class="uk-margin-small uk-list uk-list-large">
-                <li class="el-item">
-                   <h6 class="el-title   uk-margin-remove">Data acquisition</h6>
-                   <h5 class="el-content">
-                      <a target="_blank" href="www.openaire.eu/policies">How we retrieve data, how often, what processes it goes through (aggregating cleaning, trasnforming, inferring, de-duplicating), what are the quality checks&nbsp;along all&nbsp; data processing stages.</a>
-                   </h5>
-                </li>
-                <li class="el-item">
-                   <h6 class="el-title  uk-margin-remove">Data usage</h6>
-                   <h5 class="el-content">
-                      <a target="_blank" href="www.openaire.eu/policies">Who is able to retrieve our data, what are the licences, what about specific SLAs.</a>
-                   </h5>
-                </li>
-             </ul>
-             <div class="uk-margin uk-margin-remove-bottom uk-text-left">
-                <a class="el-content uk-link-text" target="_blank" href="www.openaire.eu/policies">
-                Learn more
-                </a>
-             </div>
-            </div>
-
-
-         </div>
-      </div>
-   </div>
-</div> -->
-
-<div class="uk-section-muted" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}">
+<!--<div class="uk-section-muted" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}">
    <div class="uk-container uk-container-large">
      <div uk-grid="" class="uk-grid uk-margin-large-top uk-margin-large-bottom">
-        <!--div class="uk-width-expand@m uk-width-1-2@s uk-dark uk-grid-item-match uk-first-column explore">
-          <div class="uk-margin uk-panel uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
-            <h4 class="el-title uk-margin uk-h4">
-              Researcher?
-            </h4>
-            <div class="el-content uk-margin">
-              Explore all OA research results. Link all your research. Build your profile
-            </div>
-            <p>
-              <a [href]="'https://'+(properties.environment =='beta'?'beta.':'')+'explore.openaire.eu'" class="el-link uk-button uk-button-default">
-                OpenAIRE.EXPLORE
-              </a>
-            </p>
-          </div>
-        </div-->
+
        <div class="uk-width-expand@m uk-width-1-2@s uk-dark uk-grid-item-match uk-first-column provide">
          <div class="uk-margin uk-panel uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
            <h4 class="el-title uk-margin uk-h4">
@ -484,68 +312,5 @@
        </div>
      </div>
    </div>
-  </div>
+  </div>-->

-
-<!--div class="image-front-topbar  uk-section-secondary uk-position-relative" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">
-<div style="" class="mainPageSearchForm uk-background-norepeat uk-background-cover uk-background-fixed uk-section uk-padding-remove-bottom uk-flex uk-flex-middle" uk-height-viewport="offset-top: true;offset-bottom: ! +">
-  <div class="uk-position-cover"></div>
-  <div class="uk-width-1-1">
-     <div class="uk-position-relative">
-        <div class="uk-container uk-margin-medium">
-           <div class="tm-header-placeholder uk-margin-medium" style="height: 84px;"></div>
-           <div class="search_box_bg uk-grid-large uk-flex-middle uk-grid uk-grid-stack" uk-grid="">
-              <div class="uk-width-1-1@m uk-first-column">
-                 <div data-id="page#4">
-                 <search-form   placeholderText="Search in OpenAIRE information space" link=true></search-form>
-                 </div>
-              </div>
-           </div>
-        </div>
-        <div class="uk-container uk-container-large uk-margin-medium">
-           <div class="search_box_bg uk-grid uk-grid-stack" uk-grid="">
-              <div class="uk-width-1-1@m uk-first-column">
-                 <div class="search_box_bg uk-margin-large uk-margin-remove-bottom uk-text-center uk-grid-match uk-child-width-1-2 uk-child-width-1-2@s uk-child-width-1-4@m uk-child-width-1-4@l uk-child-width-1-4@xl uk-grid-collapse uk-grid-divider uk-grid uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" uk-grid="" data-id="page#7" style="">
-                    <div  *ngIf="showPublications && publicationsSize"  class="uk-first-column">
-                       <div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
-                          <h2 class="el-title uk-margin uk-h2">
-                             <span>{{publicationsSize.number}} {{publicationsSize.size}} publications</span>
-                          </h2>
-                       </div>
-                    </div>
-                    <div  *ngIf="showDatasets && datasetsSize">
-                       <div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
-                          <h2 class="el-title uk-margin uk-h2">
-                             <span>{{datasetsSize.number}} {{datasetsSize.size}} research data</span>
-                          </h2>
-                       </div>
-                    </div>
-                    <div  *ngIf="showDataProviders && datasourcesSize"  >
-                       <div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
-                          <h2 class="el-title uk-margin uk-h2">
-                             <span>{{datasourcesSize.number}} {{datasourcesSize.size}} data sources</span>
-                          </h2>
-                       </div>
-                    </div>
-                    <div  *ngIf="showProjects && fundersSize">
-                       <div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
-                          <h2 class="el-title uk-margin uk-h2">
-                             <span>{{fundersSize.number}} {{fundersSize.size}} funders</span>
-                          </h2>
-                       </div>
-                    </div>
-                 </div>
-                 <div *ngIf = "showPublications || showDatasets || showProjects || showDataProviders" class="uk-margin-large uk-margin-remove-bottom uk-text-center uk-text-meta uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" data-id="page#8" style="">
-                  <span style="color:#fff!important; font-size:30pt!important">all linked together</span>
-                 </div>
-              </div>
-           </div>
-        </div>
-     </div>
-  </div>
-</div>
-</div>
-
-<div class="tm-main uk-container" style="min-height:200px">
-<helper position="bottom"></helper>
-</div-->
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@ -1,206 +1,279 @@
-import {Component, Input, Output, EventEmitter, ViewChild, ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
-import {Observable}       from 'rxjs';
+import {Component} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
 import {Location} from '@angular/common';
 import "rxjs/add/observable/zip";
-import {Title, Meta}                  from '@angular/platform-browser';
+import {Meta, Title} from '@angular/platform-browser';
 import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
-import {  SearchPublicationsService} from '../openaireLibrary/services/searchPublications.service';
-import {  FetchDataproviders}             from '../openaireLibrary/utils/fetchEntitiesClasses/fetchDataproviders.class';
-import {  SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service';
-import {  SearchProjectsService} from '../openaireLibrary/services/searchProjects.service';
-import {  SearchDatasetsService} from '../openaireLibrary/services/searchDatasets.service';
-import {  SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service';
-import {  RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service';
-import {  SearchFields} from '../openaireLibrary/utils/properties/searchFields';
-import {  NumberUtils} from '../openaireLibrary/utils/number-utils.class';
+import {SearchPublicationsService} from '../openaireLibrary/services/searchPublications.service';
+import {FetchDataproviders} from '../openaireLibrary/utils/fetchEntitiesClasses/fetchDataproviders.class';
+import {SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service';
+import {SearchProjectsService} from '../openaireLibrary/services/searchProjects.service';
+import {SearchDatasetsService} from '../openaireLibrary/services/searchDatasets.service';
+import {SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service';
+import {RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service';
+import {SearchFields} from '../openaireLibrary/utils/properties/searchFields';
+import {NumberUtils} from '../openaireLibrary/utils/number-utils.class';

-import {  RouterHelper} from '../openaireLibrary/utils/routerHelper.class';
-import { EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
-import { ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes';
+import {RouterHelper} from '../openaireLibrary/utils/routerHelper.class';
+import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
+import {ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes';
 import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
-import { SEOService } from '../openaireLibrary/sharedComponents/SEO/SEO.service';
+import {SEOService} from '../openaireLibrary/sharedComponents/SEO/SEO.service';
+import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/searchUtils.class";
+import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
+import {SearchSoftwareService} from "../openaireLibrary/services/searchSoftware.service";
+import {SearchOrpsService} from "../openaireLibrary/services/searchOrps.service";

@Component({
-    selector: 'home',
-    templateUrl: 'home.component.html',
+  selector: 'home',
+  templateUrl: 'home.component.html',
 })
 export class HomeComponent {
  public piwiksub: any;
  public subfunders: any;

  public pageTitle = "OpenAIRE"
-  public keyword:string = "";
+  public keyword: string = "";

-  public searchFields:SearchFields = new SearchFields();
-  public errorCodes:ErrorCodes = new ErrorCodes();
-  public routerHelper:RouterHelper = new RouterHelper();
+  public searchFields: SearchFields = new SearchFields();
+  public errorCodes: ErrorCodes = new ErrorCodes();
+  public routerHelper: RouterHelper = new RouterHelper();

-  public publicationsSize:any = null;
-  public datasetsSize:any = null;
-  public fundersSize:any = null;
-  public projectsSize:any = null;
-  public datasourcesSize:any = null;
+  public publicationsSize: any = null;
+  public datasetsSize: any = null;
+  public softwareSize: any = null;
+  public otherSize: any = null;
+  public organizationsSize: any = null;
+  public fundersSize: any = null;
+  public projectsSize: any = null;
+  public datasourcesSize: any = null;

-  private numResults: number = 2;
-  public fetchDataproviders : FetchDataproviders;
+  public fetchDataproviders: FetchDataproviders;

-  showPublications:boolean= false;
-  showDatasets:boolean= false;
-  showProjects:boolean= false;
-  showDataProviders:boolean= false;
+  showPublications: boolean = false;
+  showDatasets: boolean = false;
+  showSoftware: boolean = false;
+  showOrp: boolean = false;
+  showOrganizations: boolean = false;
+  showProjects: boolean = false;
+  showDataProviders: boolean = false;
  properties: EnvProperties;
-public subPub;public subData;public subProjects;public subOrg; public subDataPr;
+  public subPub;
+  public subSoft;
+  public subOrp;
+  public subData;
+  public subProjects;
+  public subOrg;
+  public subDataPr;
+  customFilter:SearchCustomFilter= new SearchCustomFilter();

-  constructor (
+  constructor(
    private route: ActivatedRoute,
-      private _router: Router,
-      private _searchPublicationsService: SearchPublicationsService,
-      private _searchDataprovidersService: SearchDataprovidersService,
-      private _searchProjectsService: SearchProjectsService,
-      private _searchDatasetsService: SearchDatasetsService,
-      private _searchOrganizationsService: SearchOrganizationsService,
-      private _refineFieldResultsService:RefineFieldResultsService,
-      private location: Location, private _piwikService:PiwikService,
-      private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService
-    ) {
+    private _router: Router,
+    private _searchPublicationsService: SearchPublicationsService,
+    private _searchDataprovidersService: SearchDataprovidersService,
+    private _searchProjectsService: SearchProjectsService,
+    private _searchDatasetsService: SearchDatasetsService,
+    private _searchSoftwareService: SearchSoftwareService,
+    private _searchOrpsService: SearchOrpsService,
+    private _searchOrganizationsService: SearchOrganizationsService,
+    private _refineFieldResultsService: RefineFieldResultsService,
+    private location: Location, private _piwikService: PiwikService,
+    private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService
+  ) {

-          var description = "openAIRE explore, open access, publications, research results, European commission, search";
+    let description = "openAIRE explore, open access, publications, research results, European commission, search";

-          var title = "OpenAIRE | Explore";
+    let title = "OpenAIRE | Explore";

-          this._title.setTitle(title);
-          this._meta.updateTag({content:description},"name='description'");
-          this._meta.updateTag({content:description},"property='og:description'");
-          this._meta.updateTag({content:title},"property='og:title'");
-
-
-          //this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService);
+    this._title.setTitle(title);
+    this._meta.updateTag({content: description}, "name='description'");
+    this._meta.updateTag({content: description}, "property='og:description'");
+    this._meta.updateTag({content: title}, "property='og:title'");
+    this.customFilter.set("Country", "country", "CA" , "Canada");
  }

  public ngOnInit() {
    this.route.data
-     .subscribe((data: { envSpecific: EnvProperties }) => {
+      .subscribe((data: { envSpecific: EnvProperties }) => {
        this.properties = data.envSpecific;
-        this.seoService.createLinkForCanonicalURL(this.properties.baseLink+this._router.url, false);
-        if(this.properties!=null){
-          var url = this.properties.baseLink+this._router.url;
-          this._meta.updateTag({content:url},"property='og:url'");
-          if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
+        this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this._router.url, false);
+          let url = this.properties.baseLink + this._router.url;
+          this._meta.updateTag({content: url}, "property='og:url'");
+          if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
            this.piwiksub = this._piwikService.trackView(this.properties, "OpenAIRE").subscribe();
          }
+          this.showPublications = true;
+          this.showOrp = true;
+          this.showOrganizations = true;
+          this.showDatasets = true;
+          this.showSoftware = true;
+          //this.showProjects = false;
+          // this.showDataProviders = true;
+          this.getNumbers();

-          this.config.getCommunityInformation(this.properties.adminToolsAPIURL, this.properties.adminToolsCommunity ).subscribe(data => {
-                 var showEntity = {};
-                 for(var i=0; i< data['entities'].length; i++){
+       /*   this.config.getCommunityInformation(this.properties.adminToolsAPIURL, this.properties.adminToolsCommunity).subscribe(data => {
+              let showEntity = {};
+              for (let i = 0; i < data['entities'].length; i++) {

-                   showEntity[""+data['entities'][i]["pid"]+""] = data['entities'][i]["isEnabled"];
-                 }
-                 this.showPublications =  showEntity["publication"];
-                 this.showDatasets =   showEntity["dataset"];
-                 this.showProjects =   showEntity["project"];
-                  this.showDataProviders =   showEntity["datasource"];
-                  this.getNumbers();
-                  // if(this.showDataProviders) {
-                  //   this.fetchDataproviders.getResultsForHome(this.numResults, this.properties);
-                  // }
-               },
-                error => {
-                  this.handleError("Error getting community information", error);
-                }
-            );
-        }
-       });
+                showEntity["" + data['entities'][i]["pid"] + ""] = data['entities'][i]["isEnabled"];
+              }
+              this.showPublications = showEntity["publication"];
+              this.showDatasets = showEntity["dataset"];
+              this.showProjects = showEntity["project"];
+              this.showDataProviders = showEntity["datasource"];
+              this.getNumbers();
+              // if(this.showDataProviders) {
+              //   this.fetchDataproviders.getResultsForHome(this.numResults, this.properties);
+              // }
+            },
+            error => {
+              this.handleError("Error getting community information", error);
+            }
+          );*/
+
+      });

  }
+
  public ngOnDestroy() {
-    if(this.piwiksub){
+    if (this.piwiksub) {
      this.piwiksub.unsubscribe();
    }
-    if(this.subfunders){
+    if (this.subfunders) {
      this.subfunders.unsubscribe();
    }
-        if(this.subPub){
-          this.subPub.unsubscribe();
-        }
-        if(this.subData){
-          this.subData.unsubscribe();
-        }
-    //     if(this.subProjects){
-    //       this.subProjects.unsubscribe();
-    //     }
-    //     if(this.subOrg){
-    //       this.subOrg.unsubscribe();
-    //     }
-        if(this.subDataPr){
-          this.subDataPr.unsubscribe();
-        }
+    if (this.subPub) {
+      this.subPub.unsubscribe();
+    }
+    if (this.subOrp) {
+      this.subOrp.unsubscribe();
+    }
+    if (this.subSoft) {
+      this.subSoft.unsubscribe();
+    }
+    if (this.subData) {
+      this.subData.unsubscribe();
+    }
+    if (this.subProjects) {
+      this.subProjects.unsubscribe();
+    }
+    if (this.subOrg) {
+      this.subOrg.unsubscribe();
+    }
+    if (this.subDataPr) {
+      this.subDataPr.unsubscribe();
+    }

  }

-   private getNumbers() {
-     if(this.showPublications){
-       this.subPub = this._searchPublicationsService.numOfSearchPublications("", this.properties).subscribe(
-               data => {
-                  if(data && data != null && data > 0 ){
-                      this.publicationsSize = NumberUtils.roundNumber(data);
-
-                  }
-               },
-               err => {
-         		    //console.log(err);
-                this.handleError("Error getting number of publications", err);
-          		 }
-        );
-      }
-      if(this.showDatasets){
-       this.subData = this._searchDatasetsService.numOfSearchDatasets("", this.properties).subscribe(
-             data => {
-               if(data && data != null && data > 0 ){
-                   this.datasetsSize = NumberUtils.roundNumber(data);
-               }
-             },
-             err => {
-                 //console.log(err);
-                 this.handleError("Error getting number of research data", err);
-               }
-         );
-       }
-       if(this.showProjects){
-         this.subfunders = this._refineFieldResultsService.getRefineFieldsResultsByEntityName(["funder"],"project", this.properties).subscribe(
-           data => {
-
-
-                if(data[0] && data[0] > 0 ){
-                  this.projectsSize = NumberUtils.roundNumber(data[0]);
-                }
-                if(data[1].length > 0 && data[1][0].filterId == "funder" && data[1][0].values ){
-                  this.fundersSize = NumberUtils.roundNumber(data[1][0].values.length);
-                }
-
-           },
-           err => {
-               //console.log(err);
-               this.handleError("Error getting 'funder' field results of projects", err);
+  private getNumbers() {
+    let refineQuery = null
+    if(this.customFilter){
+      refineQuery= "&fq="+StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId )));
+    }
+    if (this.showPublications) {
+      this.subPub = this._searchPublicationsService.numOfSearchPublications("", this.properties,refineQuery).subscribe(
+        data => {
+          if (data  && data > 0) {
+            this.publicationsSize = NumberUtils.roundNumber(data);
+          }else{
+            this.showPublications = false;
+          }
+        },
+        err => {
+          this.handleError("Error getting number of publications", err);
+        }
+      );
+    }
+    if (this.showDatasets) {
+      this.subData = this._searchDatasetsService.numOfSearchDatasets("", this.properties,refineQuery).subscribe(
+        data => {
+          if (data && data > 0) {
+            this.datasetsSize = NumberUtils.roundNumber(data);
+          }else{
+            this.showDatasets = false;
+          }
+        },
+        err => {
+          this.handleError("Error getting number of research data", err);
+        }
+      );
+    }
+    if (this.showSoftware) {
+      this.subSoft = this._searchSoftwareService.numOfSearchSoftware("", this.properties,refineQuery).subscribe(
+        data => {
+          if (data && data > 0) {
+            this.softwareSize = NumberUtils.roundNumber(data);
+          }else{
+            this.showSoftware = false;
+          }
+        },
+        err => {
+          this.handleError("Error getting number of software data", err);
+        }
+      );
+    }
+    if (this.showOrp) {
+      this.subOrp = this._searchOrpsService.numOfSearchOrps("", this.properties,refineQuery).subscribe(
+        data => {
+          if (data && data > 0) {
+            this.otherSize = NumberUtils.roundNumber(data);
+          }else{
+            this.showOrp = false;
+          }
+        },
+        err => {
+          this.handleError("Error getting number of software data", err);
+        }
+      );
+    }
+    if (this.showProjects) {
+      this.subfunders = this._refineFieldResultsService.getRefineFieldsResultsByEntityName(["funder"], "project", this.properties).subscribe(
+        data => {
+          if (data[0] && data[0] > 0) {
+            this.projectsSize = NumberUtils.roundNumber(data[0]);
+          }
+          else{
+            this.showProjects = false;
+          }
+          if (data[1].length > 0 && data[1][0].filterId == "funder" && data[1][0].values) {
+            this.fundersSize = NumberUtils.roundNumber(data[1][0].values.length);
+          }
+        },
+        err => {
+          this.handleError("Error getting 'funder' field results of projects", err);
        });
-      }
-      if(this.showDataProviders){
-        this.subDataPr = this._searchDataprovidersService.numOfSearchDataproviders("", this.properties).subscribe(
-           data => {
-             if(data && data != null && data > 0 ){
-                 this.datasourcesSize = NumberUtils.roundNumber(data);
-             }
+    }
+    if (this.showDataProviders) {
+      this.subDataPr = this._searchDataprovidersService.numOfSearchDataproviders("", this.properties).subscribe(
+        data => {
+          if (data && data > 0) {
+            this.datasourcesSize = NumberUtils.roundNumber(data);
+          }else{
+            this.showDataProviders = false;
+          }
+        },
+        err => {
+          this.handleError("Error getting number of content providers", err);
+        }
+      );
+    }
+    if (this.showOrganizations) {
+      this.subOrg = this._searchOrganizationsService.numOfSearchOrganizations("", this.properties, refineQuery).subscribe(
+        data => {
+          if (data && data > 0) {
+            this.organizationsSize = NumberUtils.roundNumber(data);
+          }
+        },
+        err => {
+          this.handleError("Error getting number of Organizations", err);
+        }
+      );
+    }
+  }

-           },
-           err => {
-               //console.log(err);
-               this.handleError("Error getting number of content providers", err);
-           }
-       );
-     }
-   }
-
-   private handleError(message: string, error) {
-       console.error("Home Page: "+message, error);
-   }
+  private handleError(message: string, error) {
+    console.error("Home Page: " + message, error);
+  }
 }
--- a/src/app/home/home.module.ts
+++ b/src/app/home/home.module.ts
@ -24,6 +24,8 @@ import {Schema2jsonldModule} from '../openaireLibrary/sharedComponents/schema2js
 import { SEOServiceModule } from '../openaireLibrary/sharedComponents/SEO/SEOService.module';

 import {ErrorMessagesModule} from '../openaireLibrary/utils/errorMessages.module';
+import {SoftwareServiceModule} from "../openaireLibrary/services/softwareService.module";
+import {OrpsServiceModule} from "../openaireLibrary/services/orpsService.module";

 @NgModule({
  imports: [
@ -31,7 +33,7 @@ import {ErrorMessagesModule} from '../openaireLibrary/utils/errorMessages.module
     RefineFieldResultsServiceModule,
    DataProvidersServiceModule, DatasetsServiceModule, ProjectsServiceModule,
     PublicationsServiceModule,
-    OrganizationsServiceModule,
+    OrganizationsServiceModule, SoftwareServiceModule, OrpsServiceModule,
     SearchFormModule,
      PiwikServiceModule,
      HomeRoutingModule,
--- a/src/app/landingPages/dataset/dataset.component.ts
+++ b/src/app/landingPages/dataset/dataset.component.ts
@ -1,4 +1,4 @@
-import {Component, ViewChild, ElementRef} from '@angular/core';
+import {Component} from '@angular/core';

@Component({
    selector: 'openaire-dataset',
--- a/src/app/landingPages/organization/organization.component.ts
+++ b/src/app/landingPages/organization/organization.component.ts
@ -1,4 +1,4 @@
-import {Component, ViewChild, ElementRef} from '@angular/core';
+import {Component} from '@angular/core';

@Component({
    selector: 'openaire-organization',
--- a/src/app/landingPages/orp/orp.component.ts
+++ b/src/app/landingPages/orp/orp.component.ts
@ -1,4 +1,4 @@
-import {Component, ViewChild, ElementRef} from '@angular/core';
+import {Component} from '@angular/core';

@Component({
    selector: 'openaire-orp',
--- a/src/app/landingPages/project/project.component.ts
+++ b/src/app/landingPages/project/project.component.ts
@ -1,4 +1,4 @@
-import {Component, ViewChild, ElementRef} from '@angular/core';
+import {Component} from '@angular/core';

@Component({
    selector: 'openaire-project',
--- a/src/app/landingPages/publication/publication.component.ts
+++ b/src/app/landingPages/publication/publication.component.ts
@ -1,17 +1,17 @@
-import {Component, ViewChild, ElementRef} from '@angular/core';
+import {Component} from '@angular/core';

@Component({
-    selector: 'openaire-publication',
-    template: `<publication></publication>`,
- })
-export class OpenairePublicationComponent{
-  constructor (  ) {
+  selector: 'openaire-publication',
+  template: `
+    <publication></publication>`,
+})
+export class OpenairePublicationComponent {
+  constructor() {

  }

  ngOnInit() {
-}
-
+  }


 }
--- a/src/app/landingPages/software/software.component.ts
+++ b/src/app/landingPages/software/software.component.ts
@ -1,4 +1,4 @@
-import {Component, ViewChild, ElementRef} from '@angular/core';
+import {Component} from '@angular/core';

@Component({
    selector: 'openaire-software',
--- a/src/app/searchPages/advanced/advancedSearchDatasets.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchDatasets.component.ts
@ -1,16 +1,23 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
+import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";


@Component({
-    selector: 'openaire-advanced-search-datasets',
-    template: `
-    <advanced-search-datasets>
+  selector: 'openaire-advanced-search-datasets',
+  template: `
+    <advanced-search-datasets  [customFilter]="customFilter">
    </advanced-search-datasets>

-    `
- })
+  `
+})

-export class OpenaireAdvancedSearchDatasetsComponent { 
+export class OpenaireAdvancedSearchDatasetsComponent {
+  customFilter:SearchCustomFilter= new SearchCustomFilter();
+  constructor () {
+    this.customFilter.set("Country", "country", "CA" , "Canada");
+  }
+  ngOnInit() {

+  }

 }
--- a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
@ -1,16 +1,23 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
+import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";


@Component({
-    selector: 'openaire-advanced-search-organizations',
-    template: `
-    <advanced-search-organizations>
+  selector: 'openaire-advanced-search-organizations',
+  template: `
+    <advanced-search-organizations  [customFilter]="customFilter">
    </advanced-search-organizations>

-    `
- })
+  `
+})

 export class OpenaireAdvancedSearchOrganizationsComponent {

+  customFilter:SearchCustomFilter= new SearchCustomFilter();
+  constructor () {
+    this.customFilter.set("Country", "country", "CA" , "Canada");
+  }
+  ngOnInit() {

+  }
 }
--- a/src/app/searchPages/advanced/advancedSearchOrps.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchOrps.component.ts
@ -1,16 +1,23 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
+import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";


@Component({
    selector: 'openaire-advanced-search-orps',
    template: `
-    <advanced-search-orps>
+    <advanced-search-orps [customFilter]="customFilter">
    </advanced-search-orps>

    `
 })

-export class OpenaireAdvancedSearchOrpsComponent { 
+export class OpenaireAdvancedSearchOrpsComponent {
+  customFilter:SearchCustomFilter= new SearchCustomFilter();
+  constructor () {
+    this.customFilter.set("Country", "country", "CA" , "Canada");
+  }
+  ngOnInit() {

+  }

 }
--- a/src/app/searchPages/advanced/advancedSearchProjects.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchProjects.component.ts
@ -1,4 +1,5 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
+
@Component({
    selector: 'openaire-advanced-search-projects',
    template: `
--- a/src/app/searchPages/advanced/advancedSearchPublications.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchPublications.component.ts
@ -1,13 +1,21 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
+import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";


@Component({
    selector: 'openaire-advanced-search-publications',
    template: `
-    <advanced-search-publications>
+    <advanced-search-publications [customFilter]="customFilter">
    </advanced-search-publications>
    `
 })

-export class OpenaireAdvancedSearchPublicationsComponent { 
+export class OpenaireAdvancedSearchPublicationsComponent {
+  customFilter:SearchCustomFilter= new SearchCustomFilter();
+  constructor () {
+    this.customFilter.set("Country", "country", "CA" , "Canada");
+  }
+  ngOnInit() {
+
+  }
 }
--- a/src/app/searchPages/advanced/advancedSearchSoftware.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchSoftware.component.ts
@ -1,15 +1,22 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
+import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";

@Component({
-    selector: 'openaire-advanced-search-software',
-    template: `
-    <advanced-search-software>
+  selector: 'openaire-advanced-search-software',
+  template: `
+    <advanced-search-software [customFilter]="customFilter">
    </advanced-search-software>

-    `
- })
+  `
+})

 export class OpenaireAdvancedSearchSoftwareComponent {
-  

+  customFilter:SearchCustomFilter= new SearchCustomFilter();
+  constructor () {
+    this.customFilter.set("Country", "country", "CA" , "Canada");
+  }
+  ngOnInit() {
+
+  }
 }
--- a/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts
+++ b/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts
@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     	{ path: '', component: OpenaireSearchCompatibleDataprovidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error',  community : 'openaire'
-        }, canDeactivate: [PreviousRouteRecorder]  }
-
-    ])
-  ]
-})
-export class CompatibleDataProvidersRoutingModule { }
--- a/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts
+++ b/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts
@ -1,16 +0,0 @@
-import {Component, Input, ViewChild} from '@angular/core';
-import { ActivatedRoute} from '@angular/router';
-
-@Component({
-    selector: 'openaire-search-content-providers',
-    template: `
-
-    <search-content-providers>
-    </search-content-providers>
-
-    `
-
-})
-export class OpenaireSearchCompatibleDataprovidersComponent {
-
-}
--- a/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts
+++ b/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts
@ -1,29 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import{ CompatibleDataProvidersRoutingModule} from './compatibleDataProviders-routing.module';
-import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component';
-
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-
-import {  CompatibleDataProvidersModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProviders.module';
-
-@NgModule({
-  imports: [
-    CommonModule, FormsModule,
-    CompatibleDataProvidersModule,
-    CompatibleDataProvidersRoutingModule
-
-  ],
-  declarations: [
-    OpenaireSearchCompatibleDataprovidersComponent
-   ],
-  providers:[FreeGuard, IsRouteEnabled],
-  exports: [
-    OpenaireSearchCompatibleDataprovidersComponent
-     ]
-})
-export class LibCompatibleDataProvidersModule { }
--- a/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts
+++ b/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts
@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import{OpenaireSearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     	{ path: '', component: OpenaireSearchCompatibleDataprovidersTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error',  community : 'openaire'
-        }, canDeactivate: [PreviousRouteRecorder] }
-
-    ])
-  ]
-})
-export class CompatibleDataProvidersTableRoutingModule { }
--- a/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts
+++ b/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts
@ -1,14 +0,0 @@
-import {Component, Input, ViewChild} from '@angular/core';
-
-
-@Component({
-    selector: 'openaire-search-content-providers-table',
-    template: `
-
-    <search-content-providers-table>
-    </search-content-providers-table>
-    `
-
-})
-export class OpenaireSearchCompatibleDataprovidersTableComponent { 
-}
--- a/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts
+++ b/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts
@ -1,26 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import{OpenaireSearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component';
-import {CompatibleDataProvidersTableRoutingModule} from './compatibleDataProvidersTable-routing.module';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-import {  CompatibleDataProvidersTableModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProvidersTable.module';
-
-@NgModule({
-  imports: [
-    CommonModule, FormsModule,
-    CompatibleDataProvidersTableModule,
-      CompatibleDataProvidersTableRoutingModule
-
-  ],  providers:[FreeGuard, IsRouteEnabled],
-  declarations: [
-    OpenaireSearchCompatibleDataprovidersTableComponent
-   ],
-  exports: [
-    OpenaireSearchCompatibleDataprovidersTableComponent
-     ]
-})
-export class LibCompatibleDataProvidersTableModule { }
--- a/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts
+++ b/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts
@ -1,19 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     	{ path: '', component: OpenaireSearchEntityRegistriesComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error',  community : 'openaire'
-        }, canDeactivate: [PreviousRouteRecorder]  }
-
-    ])
-  ]
-})
-export class EntityRegistriesRoutingModule { }
--- a/src/app/searchPages/dataProviders/entityRegistries.component.ts
+++ b/src/app/searchPages/dataProviders/entityRegistries.component.ts
@ -1,16 +0,0 @@
-import {Component, Input, ViewChild} from '@angular/core';
-import { ActivatedRoute} from '@angular/router';
-
-@Component({
-    selector: 'openaire-search-entity-registries',
-    template: `
-
-    <search-entity-registries>
-    </search-entity-registries>
-
-    `
-
-})
-export class OpenaireSearchEntityRegistriesComponent {
-
-}
--- a/src/app/searchPages/dataProviders/entityRegistries.module.ts
+++ b/src/app/searchPages/dataProviders/entityRegistries.module.ts
@ -1,27 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import{ EntityRegistriesRoutingModule} from './entityRegistries-routing.module';
-import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-
-import {EntityRegistriesModule } from '../../openaireLibrary/searchPages/dataProviders/entityRegistries.module';
-
-@NgModule({
-  imports: [
-    CommonModule, FormsModule,
-    EntityRegistriesModule, EntityRegistriesRoutingModule
-
-  ],
-  declarations: [
-    OpenaireSearchEntityRegistriesComponent
-   ],
-  providers:[FreeGuard, IsRouteEnabled],
-  exports: [
-    OpenaireSearchEntityRegistriesComponent
-     ]
-})
-export class LibEntityRegistriesModule { }
--- a/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts
+++ b/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts
@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import{OpenaireSearchEntityRegistriesTableComponent} from './entityRegistriesTable.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     	{ path: '', component: OpenaireSearchEntityRegistriesTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error',  community : 'openaire'
-        }, canDeactivate: [PreviousRouteRecorder]  }
-
-    ])
-  ]
-})
-export class EntityRegistriesTableRoutingModule { }
--- a/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts
+++ b/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts
@ -1,16 +0,0 @@
-import {Component} from '@angular/core';
-
-
-@Component({
-    selector: 'openaire-search-entity-registries-table',
-    template: `
-
-    <search-entity-registries-table>
-    </search-entity-registries-table>
-
-    `
-
-})
-export class OpenaireSearchEntityRegistriesTableComponent {
-
-}
--- a/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts
+++ b/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts
@ -1,27 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import{OpenaireSearchEntityRegistriesTableComponent} from './entityRegistriesTable.component';
- import {EntityRegistriesTableRoutingModule} from './entityRegistriesTable-routing.module';
-import {  EntityRegistriesTableModule} from '../../openaireLibrary/searchPages/dataProviders/entityRegistriesTable.module';
-
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-
-@NgModule({
-  imports: [
-    CommonModule, FormsModule,
-    EntityRegistriesTableRoutingModule,
-    EntityRegistriesTableModule
-
-  ],  providers:[FreeGuard, IsRouteEnabled],
-  declarations: [
-    OpenaireSearchEntityRegistriesTableComponent
-   ],
-  exports: [
-    OpenaireSearchEntityRegistriesTableComponent
-     ]
-})
-export class LibEntityRegistriesTableModule { }
--- a/src/app/searchPages/dataProviders/journals-routing.module.ts
+++ b/src/app/searchPages/dataProviders/journals-routing.module.ts
@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import{OpenaireSearchJournalsComponent} from './journals.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     	{ path: '', component: OpenaireSearchJournalsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error',  community : 'openaire'
-        }, canDeactivate: [PreviousRouteRecorder]  }
-
-    ])
-  ]
-})
-export class JournalsRoutingModule { }
--- a/src/app/searchPages/dataProviders/journals.component.ts
+++ b/src/app/searchPages/dataProviders/journals.component.ts
@ -1,14 +0,0 @@
-import {Component, Input, ViewChild} from '@angular/core';
-import { ActivatedRoute} from '@angular/router';
-
-@Component({
-    selector: 'openaire-search-journals',
-    template: `
-
-    <search-journals>
-    </search-journals>
-    `
-
-})
-export class OpenaireSearchJournalsComponent {
-}
--- a/src/app/searchPages/dataProviders/journals.module.ts
+++ b/src/app/searchPages/dataProviders/journals.module.ts
@ -1,24 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import{ JournalsRoutingModule} from './journals-routing.module';
-import{OpenaireSearchJournalsComponent} from './journals.component';
-import { JournalsModule} from '../../openaireLibrary/searchPages/dataProviders/journals.module';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-@NgModule({
-  imports: [
-    CommonModule, FormsModule, JournalsRoutingModule, JournalsModule
-
-  ],
-  declarations: [
-    OpenaireSearchJournalsComponent
-   ],
-  providers:[FreeGuard, IsRouteEnabled],
-  exports: [
-    OpenaireSearchJournalsComponent
-     ]
-})
-export class LibJournalsModule { }
--- a/src/app/searchPages/dataProviders/journalsTable-routing.module.ts
+++ b/src/app/searchPages/dataProviders/journalsTable-routing.module.ts
@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import{OpenaireSearchJournalsTableComponent} from './journalsTable.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     	{ path: '', component: OpenaireSearchJournalsTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error',  community : 'openaire'
-        } , canDeactivate: [PreviousRouteRecorder] }
-
-    ])
-  ]
-})
-export class JournalsTableRoutingModule { }
--- a/src/app/searchPages/dataProviders/journalsTable.component.ts
+++ b/src/app/searchPages/dataProviders/journalsTable.component.ts
@ -1,15 +0,0 @@
-import {Component } from '@angular/core';
-
-
-@Component({
-    selector: 'openaire-search-journals-table',
-    template: `
-
-    <search-journals-table>
-    </search-journals-table>
-    `
-
-})
-export class OpenaireSearchJournalsTableComponent {
-
-}
--- a/src/app/searchPages/dataProviders/journalsTable.module.ts
+++ b/src/app/searchPages/dataProviders/journalsTable.module.ts
@ -1,27 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import{OpenaireSearchJournalsTableComponent} from './journalsTable.component';
-
-import {JournalsTableRoutingModule} from './journalsTable-routing.module';
-
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-import { JournalsTableModule} from '../../openaireLibrary/searchPages/dataProviders/journalsTable.module';
-
-@NgModule({
-  imports: [
-    CommonModule, FormsModule,
-    JournalsTableModule, JournalsTableRoutingModule
-
-  ],  providers:[FreeGuard, IsRouteEnabled],
-  declarations: [
-    OpenaireSearchJournalsTableComponent
-   ],
-  exports: [
-    OpenaireSearchJournalsTableComponent
-     ]
-})
-export class LibJournalsTableModule { }
--- a/src/app/searchPages/find/search.component.ts
+++ b/src/app/searchPages/find/search.component.ts
@ -1,18 +1,44 @@
 import {Component, ViewChild, ElementRef} from '@angular/core';
+import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
+import {ActivatedRoute} from "@angular/router";

@Component({
    selector: 'openaire-search-find',
    template: `
-    <search-find logoURL = "/assets/common-assets/logo-small-explore.png" name="OpenAIRE Explore"></search-find>
+    <search-find logoURL = "/assets/common-assets/logo-small-aggregator.png" name="OpenAIRE" [customFilter]="customFilter"></search-find>
 
    `,
 })
 export class OpenaireSearchComponent{
-  constructor (  ) {
+  customFilter:SearchCustomFilter= new SearchCustomFilter();
+  constructor ( private  route: ActivatedRoute ) {
+

  }

  ngOnInit() {
+    let id = this.route.snapshot.paramMap.get('id');
+    if(id && id.length > 0){
+      this.customFilter.set("Country", "country", id , "");
+    }else{
+      this.customFilter.set("Country", "country", "CA" , "Canada");
+    }
+    this.route.data
+      .subscribe((data: { envSpecific: any }) => {
+
+        // this.piwikSiteId = PiwikHelper.siteIDs[communityId];
+        // if(communityId){
+        //   this.connectCommunityId = communityId
+        // }else{
+        //   this.route.queryParams.subscribe(data => {
+        //
+        //     if(data['communityId'] && data['communityId']!=""){
+        //       this.connectCommunityId = data['communityId'];
+        //       this.piwikSiteId = PiwikHelper.siteIDs[this.connectCommunityId];
+        //     }
+        //   });
+        // }
+      });
 }


--- a/src/app/searchPages/simple/searchDatasets.component.ts
+++ b/src/app/searchPages/simple/searchDatasets.component.ts
@ -1,14 +1,23 @@
-import {Component, Input, ViewChild} from '@angular/core';
- 
-@Component({
-    selector: 'openaire-search-datasets',
-    template: `
+import {Component} from '@angular/core';
+import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";

-    <search-datasets>
+@Component({
+  selector: 'openaire-search-datasets',
+  template: `
+
+    <search-datasets [customFilter]="customFilter">
    </search-datasets>
-    `
+  `
 })

 export class OpenaireSearchDatasetsComponent {
+  customFilter: SearchCustomFilter = new SearchCustomFilter();

+  constructor() {
+    this.customFilter.set("Country", "country", "CA", "Canada");
+  }
+
+  ngOnInit() {
+
+  }
 }
--- a/src/app/searchPages/simple/searchOrganizations.component.ts
+++ b/src/app/searchPages/simple/searchOrganizations.component.ts
@ -1,15 +1,22 @@
 import {Component, Input, ViewChild} from '@angular/core';
+import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";

@Component({
    selector: 'openaire-search-organizations',
    template: `

-    <search-organizations>
+    <search-organizations [customFilter]="customFilter">
    </search-organizations>

    `

 })
 export class OpenaireSearchOrganizationsComponent {
+    customFilter:SearchCustomFilter= new SearchCustomFilter();
+    constructor () {
+        this.customFilter.set("Country", "country", "CA" , "Canada");
+    }
+    ngOnInit() {

+    }
 }
--- a/src/app/searchPages/simple/searchOrps.component.ts
+++ b/src/app/searchPages/simple/searchOrps.component.ts
@ -1,14 +1,21 @@
 import {Component, Input, ViewChild} from '@angular/core';
+import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";

@Component({
    selector: 'openaire-search-orps',
    template: `

-    <search-orps>
+    <search-orps [customFilter]="customFilter">
    </search-orps>
    `
 })

 export class OpenaireSearchOrpsComponent {
+    customFilter:SearchCustomFilter= new SearchCustomFilter();
+    constructor () {
+        this.customFilter.set("Country", "country", "CA" , "Canada");
+    }
+    ngOnInit() {

+    }
 }
--- a/src/app/searchPages/simple/searchPublications.component.ts
+++ b/src/app/searchPages/simple/searchPublications.component.ts
@ -1,10 +1,12 @@
 import {Component, Input, ViewChild} from '@angular/core';
+import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
+import {ActivatedRoute} from "@angular/router";

@Component({
    selector: 'openaire-search-publications',
    template: `

-    <search-publications>
+    <search-publications [customFilter]="customFilter">
    </search-publications>

    `
@ -12,5 +14,18 @@ import {Component, Input, ViewChild} from '@angular/core';
 })
 export class OpenaireSearchPublicationsComponent {

+    customFilter:SearchCustomFilter= new SearchCustomFilter();
+    constructor ( private  route: ActivatedRoute ) {
+        
+    }
+    ngOnInit() {
+        let id = this.route.snapshot.paramMap.get('id');
+        if(id && id.length > 0){
+            this.customFilter.set("Country", "country", id , "");
+        }else{
+            this.customFilter.set("Country", "country", "CA" , "Canada");
+        }
+    }
+

 }
--- a/src/app/searchPages/simple/searchSoftware.component.ts
+++ b/src/app/searchPages/simple/searchSoftware.component.ts
@ -1,14 +1,22 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
+import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";

@Component({
    selector: 'openaire-search-software',
    template: `

-    <search-software>
+    <search-software [customFilter]="customFilter">
    </search-software>
    `
 })

 export class OpenaireSearchSoftwareComponent {
+    customFilter:SearchCustomFilter= new SearchCustomFilter();
+    constructor () {
+        this.customFilter.set("Country", "country", "CA" , "Canada");
+    }
+    ngOnInit() {
+
+    }

 }
--- a/src/assets/env-properties.json
+++ b/src/assets/env-properties.json
@ -33,7 +33,7 @@
  "helpdesk" : "https://www.openaire.eu/support/helpdesk",
  "uploadService" : "http://scoobydoo.di.uoa.gr:8000/upload",

-  "vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/",
+  "vocabulariesAPI" :"https://dev-openaire.d4science.org/provision/mvc/vocabularies/",

  "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",
  "piwikSiteId" : "6",
@ -93,7 +93,7 @@
  "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders",
  "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations",
  "lastIndexInformationLink" : "https://www.openaire.eu/aggregation-and-content-provision-workflows",
-  "showLastIndexInformationLink" : true,
+  "showLastIndexInformationLink" : false,
  "widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
  "claimsInformationLink": "https://www.openaire.eu/linking-beta"
 }