diff --git a/landingPages/dataProvider/dataProvider.component.ts b/landingPages/dataProvider/dataProvider.component.ts
index ec9c4ad2..6c4b8be0 100644
--- a/landingPages/dataProvider/dataProvider.component.ts
+++ b/landingPages/dataProvider/dataProvider.component.ts
@@ -434,7 +434,7 @@ export class DataProviderComponent {
         },
         err => {
           //console.log(err);
-          this.handleError("Error getting " + this.type + " for " + (this.datasourceId ? ("id: " + this.datasourceId) : ("pid: " + this.identifier.id + " ("+this.identifier.class+")")), err);
+          this.handleError("Error getting " + this.type + " for " + (this.datasourceId ? ("id: " + this.datasourceId) : ("pid: " + this.identifier.id)), err);
           if (err.status == 404) {
             this._router.navigate([this.properties.errorLink], {
               queryParams: {
diff --git a/landingPages/dataProvider/dataProvider.service.ts b/landingPages/dataProvider/dataProvider.service.ts
index 49d3e911..a80645e8 100644
--- a/landingPages/dataProvider/dataProvider.service.ts
+++ b/landingPages/dataProvider/dataProvider.service.ts
@@ -24,7 +24,7 @@ export class DataProviderService {
     if (id) {
       return  properties.searchAPIURLLAst + typePathParam + "/" + id + '?format=json';
     } else if (identifier) {
-      return properties.searchAPIURLLAst + "resources2?pid="+encodeURIComponent(identifier.id) + "&pidtype=" + identifier.class + "&type="+typePathParam+"&format=json";
+      return properties.searchAPIURLLAst + "resources2?query=(pid exact \""+encodeURIComponent(identifier.id) + "\")&type="+typePathParam+"&format=json";
     }
   }
 
diff --git a/landingPages/result/resultLanding.component.ts b/landingPages/result/resultLanding.component.ts
index 9ba1309b..9e1c8714 100644
--- a/landingPages/result/resultLanding.component.ts
+++ b/landingPages/result/resultLanding.component.ts
@@ -604,7 +604,7 @@ export class ResultLandingComponent {
         }
       },
       err => {
-        this.handleError("Error getting " + this.type + " for " + (this.id ? ("id: " + this.id) : ("pid: " + this.identifier.id + " ("+this.identifier.class+")")), err);
+        this.handleError("Error getting " + this.type + " for " + (this.id ? ("id: " + this.id) : ("pid: " + this.identifier.id)), err);
         if (err.status == 404) {
           this._router.navigate([this.properties.errorLink], {queryParams: {"page": this._location.path(true), "page_type": this.type}});
         }else if(err.name == "TimeoutError"){
diff --git a/landingPages/result/resultLanding.service.ts b/landingPages/result/resultLanding.service.ts
index 49c24532..7ed58bb0 100644
--- a/landingPages/result/resultLanding.service.ts
+++ b/landingPages/result/resultLanding.service.ts
@@ -39,7 +39,7 @@ export class ResultLandingService {
     } else if (identifier) {
       // pid = "10.3389/fphys.2014.00466";
       let url = properties.searchAPIURLLAst + "resources2";
-      url += "?pid=" + encodeURIComponent(identifier.id) + "&pidtype=" + identifier.class + "&type=";
+      url += "?query=(pid exact \"" + encodeURIComponent(identifier.id) + "\")&type=";
       if (type === 'publication') {
         url += 'publications';
       } else if (type === 'dataset') {
diff --git a/monitor-admin/topic/topic.component.html b/monitor-admin/topic/topic.component.html
index 8197b19a..e11e98c5 100644
--- a/monitor-admin/topic/topic.component.html
+++ b/monitor-admin/topic/topic.component.html
@@ -190,7 +190,7 @@
       </div>
     </div>
   </aside>
-  <div #pageContent *ngIf="stakeholder && filters" page-content>
+  <div #pageContent *ngIf="stakeholder && filters" class="uk-width-1-1" page-content>
     <div actions>
       <div *ngIf="stakeholder.topics.length > 0" class="uk-flex uk-flex-center uk-margin-medium-top uk-flex-right@m uk-width-1-1">
         <button class="uk-button uk-button-primary uk-flex uk-flex-middle">
diff --git a/orcid/my-orcid-links/myOrcidLinks.component.ts b/orcid/my-orcid-links/myOrcidLinks.component.ts
index 5fbe58b8..29d66592 100644
--- a/orcid/my-orcid-links/myOrcidLinks.component.ts
+++ b/orcid/my-orcid-links/myOrcidLinks.component.ts
@@ -302,7 +302,7 @@ export class MyOrcidLinksComponent {
     for(let work of works) {
       for(let pid of work['pids']) {
         let identifier: Identifier = Identifier.getIdentifierFromString(pid, false);
-        this.orcidQuery += (this.orcidQuery ? " or " : "") + ('(pidclassid exact "'+identifier.class+'" and pid="'+StringUtils.URIEncode(identifier.id)+'")');
+        this.orcidQuery += (this.orcidQuery ? " or " : "") + ('(pid="'+StringUtils.URIEncode(identifier.id)+'")');
       }
     }
     this.showLoading = false;
diff --git a/searchPages/searchUtils/newSearchPage.component.ts b/searchPages/searchUtils/newSearchPage.component.ts
index a61b99e6..96aa3e20 100644
--- a/searchPages/searchUtils/newSearchPage.component.ts
+++ b/searchPages/searchUtils/newSearchPage.component.ts
@@ -982,7 +982,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
           doisParams += (doisParams.length > 0 ? " or " : "") + '(authorid="' + StringUtils.URIEncode(identifier.id) + '")';
           // doisParams += (doisParams.length > 0 ? " or " : "") +'(authorid="' + StringUtils.URIEncode(identifier.id) + '" and (authoridtype exact "orcid"))';
         } else {
-          doisParams += (doisParams.length > 0 ? " or " : "") + '(pidclassid exact "' + identifier.class + '" and pid="' + StringUtils.URIEncode(identifier.id) + '")';
+          doisParams += (doisParams.length > 0 ? " or " : "") + '(pid="' + StringUtils.URIEncode(identifier.id) + '")';
           // doisParams += (doisParams.length > 0 ? " or " : "") +'(pidclassid exact "' + identifier.class + '" and pid="' +  identifier.id + '")';
         }
       }
diff --git a/utils/properties/env-properties.ts b/utils/properties/env-properties.ts
index 4a2ccd68..65931eaa 100644
--- a/utils/properties/env-properties.ts
+++ b/utils/properties/env-properties.ts
@@ -1,6 +1,6 @@
 export type Environment = "development" | "test" | "beta" | "production";
-export type Dashboard = "explore" | "connect" | "monitor" | "aggregator" | "eosc" | "developers";
-export type PortalType = "explore" | "connect" | "community" | "monitor" | "funder" | "ri" | "project" | "organization" | "aggregator" | "eosc";
+export type Dashboard = "explore" | "connect" | "monitor" | "aggregator" | "eosc" | "developers" | "faircore4eosc";
+export type PortalType = "explore" | "connect" | "community" | "monitor" | "funder" | "ri" | "project" | "organization" | "aggregator" | "eosc" | "faircore4eosc";
 
 export interface EnvProperties {
   environment?: Environment;