diff --git a/portal-2/src/app/landingPages/dataProvider/dataProvider.component.ts b/portal-2/src/app/landingPages/dataProvider/dataProvider.component.ts
index 39dd7c6b..2da2bc8b 100644
--- a/portal-2/src/app/landingPages/dataProvider/dataProvider.component.ts
+++ b/portal-2/src/app/landingPages/dataProvider/dataProvider.component.ts
@@ -175,11 +175,11 @@ export class DataProviderComponent {
 
                this.metricsClicked = false;
 
-               this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"dtsrcRepoViews","dtsrcName":"'+this.datasourceId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"chart","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
+               this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"dtsrcRepoViews","dtsrcName":"'+this.datasourceId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["column"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
                /*this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"dtsrcOpenAIRETimeline", "dtsrcName":"'+this.datasourceId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"OpenAIRE","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]},{"query":"dtsrcRepoTimeline", "dtsrcName":"'+this.datasourceId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":[""],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column","column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
                */
 
-               this.downloadsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"dtsrcRepoDownloads","dtsrcName":"'+this.datasourceId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"chart","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
+               this.downloadsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"dtsrcRepoDownloads","dtsrcName":"'+this.datasourceId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["column"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
                /*
                this.downloadsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"dtsrcDownloadsTimeline","dtsrcName":"'+this.datasourceId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"chart","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
                */
diff --git a/portal-2/src/app/landingPages/project/project.component.ts b/portal-2/src/app/landingPages/project/project.component.ts
index 716e2132..f8185a8b 100644
--- a/portal-2/src/app/landingPages/project/project.component.ts
+++ b/portal-2/src/app/landingPages/project/project.component.ts
@@ -188,11 +188,11 @@ console.info(this.projectInfo.title);
           this.updateDescription("project, funding, open access, publications, datasets, "+this.projectName+ ","+this.projectInfo.funder);
           this.project= { funderId: "", funderName: this.projectInfo.funder, projectId: this.projectId, projectName: this.projectInfo.title, projectAcronym: this.projectInfo.acronym, startDate: this.projectInfo.startDate, endDate: this.projectInfo.endDate };
 
-          this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"projRepoViews","projTitle":"'+this.projectId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
+          this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"projRepoViews","projTitle":"'+this.projectId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["column"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
           /*this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"projViewsTimeline","projTitle":"'+this.projectId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
           */
 
-          this.downloadsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"projRepoDownloads","projTitle":"'+this.projectId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
+          this.downloadsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"projRepoDownloads","projTitle":"'+this.projectId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["column"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
           /*
           this.downloadsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"projDownloadsTimeline","projTitle":"'+this.projectId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
           */
diff --git a/portal-2/src/app/landingPages/publication/publication.component.ts b/portal-2/src/app/landingPages/publication/publication.component.ts
index c746a786..0ab3d83e 100644
--- a/portal-2/src/app/landingPages/publication/publication.component.ts
+++ b/portal-2/src/app/landingPages/publication/publication.component.ts
@@ -69,6 +69,8 @@ export class PublicationComponent {
           this.articleId = data['articleId'];
           console.info("Article id is :"+this.articleId);
 
+          this.metricsClicked = false;
+
           if(this.articleId){
 
               this.getPublicationInfo(this.articleId);
@@ -79,7 +81,6 @@ export class PublicationComponent {
               this.showLoading = false;
               this.warningMessage="No valid publication id";
           }
-          this.metricsClicked = false;
 
           this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"resRepoViews", "resTitle":"'+this.articleId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
           /*this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"resViewsTimeline", "resTitle":"'+this.articleId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
@@ -152,6 +153,7 @@ export class PublicationComponent {
                   this.activeTab = "Software";
                 } else {
                   this.activeTab = "Metrics";
+                  this.metricsClicked = true;
                 }
                 console.info("activeTab is "+this.activeTab);
             },
diff --git a/portal-2/src/app/landingPages/searchingProjectsInTab.component.ts b/portal-2/src/app/landingPages/searchingProjectsInTab.component.ts
index 0f80ccf8..fd223b0c 100644
--- a/portal-2/src/app/landingPages/searchingProjectsInTab.component.ts
+++ b/portal-2/src/app/landingPages/searchingProjectsInTab.component.ts
@@ -21,34 +21,34 @@ import {RouterHelper} from '../utils/routerHelper.class';
 
         <div *ngIf="fetchProjects.searchUtils.totalResults > 0">
             <div class = "uk-text-right" *ngIf = "fetchProjects.totalResults > 10">
-				<!--a [href] = "linkToSearchProjects">
-                    View all {{fetchProjects.totalResults}} results
-                </a-->
                 <a  [queryParams]="routerHelper.createQueryParams(['organizationId', 'or'], [organizationId, 'and'])"
                     routerLinkActive="router-link-active" [routerLink]="linkToSearchProjects">
                     View all {{fetchProjects.totalResults}} results
                 </a>
-			</div>
+			      </div>
             <div class= "searchPaging uk-panel uk-margin-top">
-              <div class="uk-float-right" *ngIf="fetchProjects.results  && fetchProjects.searchUtils.totalResults > fetchProjects.searchUtils.size">
-              <paging-no-load [currentPage]="page" [totalResults]="fetchProjects.searchUtils.totalResults" [term]="keyword" [size]="size"  (pageChange)="pageChange($event)"> </paging-no-load>
-            </div>
-            <ul  *ngIf = "fetchProjects.funders.length > 1" class="uk-list uk-list-divider">
-              <li  *ngFor="let filter of fetchProjects.filters "  >
-                  <div class="text-bold">Filter by {{filter.title}}:</div>
-                  <span *ngFor = "let value of filter.values"  class = "uk-animation-fade">
-                     <input [(ngModel)]="value.selected" type="checkbox"  (ngModelChange)="filterChange(value.selected)" />
-                     <span title = "{{value.name}}"> {{value.name}}</span><span *ngIf = "showResultCount === true" > ({{value.number}})</span>
-                  </span>
-              </li>
+              <div class="uk-clearfix">
+                <div class="uk-float-right" *ngIf="fetchProjects.results  && fetchProjects.searchUtils.totalResults > fetchProjects.searchUtils.size">
+                  <paging-no-load [currentPage]="page" [totalResults]="fetchProjects.searchUtils.totalResults" [term]="keyword" [size]="size"  (pageChange)="pageChange($event)"> </paging-no-load>
+                </div>
+              </div>
+              <ul  *ngIf = "fetchProjects.funders.length > 1" class="uk-list uk-list-divider">
+                <li  *ngFor="let filter of fetchProjects.filters "  >
+                    <div class="text-bold">Filter by {{filter.title}}:</div>
+                    <span *ngFor = "let value of filter.values"  class = "uk-animation-fade">
+                       <input [(ngModel)]="value.selected" type="checkbox"  (ngModelChange)="filterChange(value.selected)" />
+                       <span title = "{{value.name}}"> {{value.name}}</span><span *ngIf = "showResultCount === true" > ({{value.number}})</span>
+                    </span>
+                </li>
 
-              <li *ngIf = "fetchProjects.searchUtils.totalResults !=fetchProjects.totalResults "> Filtered {{fetchProjects.searchUtils.totalResults}} results of {{fetchProjects.totalResults}} total results</li>
-              <li></li>
-            </ul>
+                <li *ngIf = "fetchProjects.searchUtils.totalResults !=fetchProjects.totalResults "> Filtered {{fetchProjects.searchUtils.totalResults}} results of {{fetchProjects.totalResults}} total results</li>
+                <li></li>
+              </ul>
 
-            <tab-result  [(results)]="fetchProjects.results" [(status)]= "fetchProjects.searchUtils.status"
+              <tab-result  [(results)]="fetchProjects.results" [(status)]= "fetchProjects.searchUtils.status"
                             type="project" urlParam="projectId" showLoading = true>
-            </tab-result>
+              </tab-result>
+            </div>
         </div>
     `
 })
diff --git a/portal-2/src/app/landingPages/showAuthors.component.ts b/portal-2/src/app/landingPages/showAuthors.component.ts
index 8dcfc64e..2491c828 100644
--- a/portal-2/src/app/landingPages/showAuthors.component.ts
+++ b/portal-2/src/app/landingPages/showAuthors.component.ts
@@ -1,4 +1,4 @@
-import {Component, Input} from '@angular/core';
+import {Component, Input, ElementRef} from '@angular/core';
 import {RouterHelper} from '../utils/routerHelper.class';
 
 @Component({
@@ -31,7 +31,7 @@ import {RouterHelper} from '../utils/routerHelper.class';
                 </a>
             </span>
             <span *ngIf="showAll">
-                <a class="uk-text-muted" (click)="showAll = !showAll;">View less authors</a>
+                <a class="uk-text-muted" (click)="showAll = !showAll; scroll()">View less authors</a>
             </span>
         </span>
 
@@ -46,7 +46,7 @@ export class ShowAuthorsComponent {
     private showAll: boolean = false;
     public routerHelper:RouterHelper = new RouterHelper();
 
-    constructor () {
+    constructor (private element: ElementRef) {
     }
 
     ngOnInit() {
@@ -55,4 +55,11 @@ export class ShowAuthorsComponent {
     public  quote(params: string):string {
         return '"'+params+'"';
     }
+
+    public scroll() {
+      console.info("scroll into view");
+      if (typeof document !== 'undefined') {
+         this.element.nativeElement.scrollIntoView();
+      }
+    }
 }
diff --git a/portal-2/src/app/landingPages/showIdentifiers.component.ts b/portal-2/src/app/landingPages/showIdentifiers.component.ts
index 0321120b..e5e46281 100644
--- a/portal-2/src/app/landingPages/showIdentifiers.component.ts
+++ b/portal-2/src/app/landingPages/showIdentifiers.component.ts
@@ -1,27 +1,34 @@
-import {Component, Input} from '@angular/core';
+import {Component, Input, ElementRef} from '@angular/core';
 import {OpenaireProperties} from '../utils/properties/openaireProperties';
 
 @Component({
     selector: 'showIdentifiers',
     template: `
-        <!--dl class="uk-description-list" *ngIf="identifiers != undefined && identifiers.size > 0">
-            <dt>Identifiers:</dt>
-            <dd-->
-                <span *ngFor="let key of identifiers.keys() let i=index">
-                    <span *ngFor="let item of identifiers.get(key) let j=index">
-                        <span *ngIf="i>0 || j>0">{{", "}}</span>
-                        <span class="custom-external custom-icon">
-                            <a *ngIf="key=='doi'" href="{{doiURL}}{{item}}" target="_blank">
-                                {{key}}: {{item}}
-                            </a>
-                            <a *ngIf="key=='pmc'" href="{{pmcURL}}{{item}}" target="_blank">
-                                {{key}}: {{item}}
-                            </a>
-                        </span>
-                    </span>
+
+                <span *ngIf="showAll && countIdentifiers() > 10">
+                    <a class="uk-text-muted" (click)="showAll = !showAll;">View less identifiers</a>
                 </span>
-            <!--/dd>
-        </dl-->
+
+                <ng-container *ngFor="let key of identifiers.keys() let i=index">
+                    <ng-container *ngFor="let item of identifiers.get(key) let j=index">
+                      <span *ngIf="(i+j)<10 || showAll" class="custom-external custom-icon">
+                        <a *ngIf="key=='doi'" href="{{doiURL}}{{item}}" target="_blank">{{key}}: {{item}}</a><a
+                        *ngIf="key=='pmc'" href="{{pmcURL}}{{item}}" target="_blank">{{key}}: {{item}}</a></span><span
+
+                        *ngIf="((i+j)<10 || showAll) && ((i+j) < countIdentifiers()-1)">{{", "}}</span>
+                      <span *ngIf="!showAll && (i+j)==10"> ... </span>
+                    </ng-container>
+                </ng-container>
+
+                <span *ngIf="!showAll && countIdentifiers() > 10">
+                    <a class="uk-text-muted" (click)="showAll = !showAll;">
+                        view all {{countIdentifiers()}} identifiers
+                    </a>
+                </span>
+                <span *ngIf="showAll && countIdentifiers() > 10">
+                    <a class="uk-text-muted" (click)="showAll = !showAll; scroll()">View less identifiers</a>
+                </span>
+
 
     `
     })
@@ -30,12 +37,33 @@ export class ShowIdentifiersComponent {
     @Input() identifiers: Map<string, string[]>;
     doiURL: string;
     pmcURL: string;
+    public showAll: boolean = false;
+    public num: number = -1;
 
-    constructor () {
+    constructor (private element: ElementRef) {
         this.doiURL = OpenaireProperties.getDoiURL();
         this.pmcURL = OpenaireProperties.getPmcURL();
     }
 
-    ngOnInit() {
+    ngOnInit() {}
+
+    public countIdentifiers() {
+      if(this.num < 0) {
+        let num = 0;
+        if(this.identifiers != undefined) {
+            this.identifiers.forEach(function (value, key, map) {
+                num += value.length;
+            });
+        }
+        this.num = num;
+      }
+      return this.num;
+    }
+
+    public scroll() {
+      console.info("scroll into view");
+      if (typeof document !== 'undefined') {
+         this.element.nativeElement.scrollIntoView();
+      }
     }
 }
diff --git a/portal-2/src/app/searchPages/searchUtils/searchResult.component.ts b/portal-2/src/app/searchPages/searchUtils/searchResult.component.ts
index bc6a5e9d..f90f6825 100644
--- a/portal-2/src/app/searchPages/searchUtils/searchResult.component.ts
+++ b/portal-2/src/app/searchPages/searchUtils/searchResult.component.ts
@@ -87,7 +87,7 @@ import {RouterHelper} from '../../utils/routerHelper.class';
             <span *ngIf="result.startYear && result.endYear"> ({{result.startYear}} - {{result.endYear}})</span>
             <div *ngIf="result['organizations'] != undefined && result['organizations'].length > 0">
                 <span> Organizations: </span>
-                <span *ngFor="let organization of result['organizations'] let i=index">
+                <span *ngFor="let organization of result['organizations'].slice(0,10) let i=index">
                     <!--a *ngIf="organization.url != undefined" href="{{organization.url}}"-->
                     <a *ngIf="organization.id" [queryParams]="{organizationId: organization.id}" routerLinkActive="router-link-active" routerLink="/search/organization">
                             {{organization.name}}</a><span
@@ -95,8 +95,9 @@ import {RouterHelper} from '../../utils/routerHelper.class';
                         *ngIf="!organization.id">
                             {{organization.name}}</span><span
 
-                        *ngIf="i < result['organizations'].length-1">,</span>
+                        *ngIf="(i < result['organizations'].length-1) && (i < 9)">,</span>
                 </span>
+                <span *ngIf="result['organizations'].length > 10">...</span>
             </div>
 
             <div *ngIf="result['type'] != undefined && result['type'] != ''">Type: {{result['type']}}</div>
diff --git a/portal-2/src/app/searchPages/searchUtils/tabResult.component.ts b/portal-2/src/app/searchPages/searchUtils/tabResult.component.ts
index 4abf99b0..daa223ab 100644
--- a/portal-2/src/app/searchPages/searchUtils/tabResult.component.ts
+++ b/portal-2/src/app/searchPages/searchUtils/tabResult.component.ts
@@ -87,7 +87,7 @@ import {RouterHelper} from '../../utils/routerHelper.class';
             <span *ngIf="result.startYear && result.endYear"> ({{result.startYear}} - {{result.endYear}})</span>
             <div *ngIf="result['organizations'] != undefined && result['organizations'].length > 0">
                 <span> Organizations: </span>
-                <span *ngFor="let organization of result['organizations'] let i=index">
+                <span *ngFor="let organization of result['organizations'].slice(0, 10) let i=index">
                     <!--a *ngIf="organization.url != undefined" href="{{organization.url}}"-->
                     <a *ngIf="organization.id" [queryParams]="{organizationId: organization.id}" routerLinkActive="router-link-active" routerLink="/search/organization">
                             {{organization.name}}</a><span
@@ -95,8 +95,9 @@ import {RouterHelper} from '../../utils/routerHelper.class';
                         *ngIf="!organization.id">
                             {{organization.name}}</span><span
 
-                        *ngIf="i < result['organizations'].length-1">,</span>
+                        *ngIf="(i < result['organizations'].length-1) && (i < 9)">,</span>
                 </span>
+                <span *ngIf="result['organizations'].length > 10">...</span>
             </div>
 
             <div *ngIf="result['type'] != undefined && result['type'] != ''">Type: {{result['type']}}</div>
diff --git a/portal-2/src/app/services/project.service.ts b/portal-2/src/app/services/project.service.ts
index 3c9ddf04..91cd3e69 100644
--- a/portal-2/src/app/services/project.service.ts
+++ b/portal-2/src/app/services/project.service.ts
@@ -160,7 +160,7 @@ export class ProjectService {
             } else {
                 for(let i=0; i<data[2].length; i++) {
                     if(data[2][i].hasOwnProperty("to") && data[2][i]['to'].class == "hasParticipant") {
-                        if(data[2][i].hasOwnProperty("legalshortname")) {
+                        if(data[2][i].hasOwnProperty("legalshortname") && data[2][i].legalshortname) {
                             name = data[2][i].legalshortname;
                         } else if(data[2][i].hasOwnProperty("legalname")) {
                             name = data[2][i].legalname;
diff --git a/portal-2/src/app/services/searchDataproviders.service.ts b/portal-2/src/app/services/searchDataproviders.service.ts
index 25ed92e5..4e5d8251 100644
--- a/portal-2/src/app/services/searchDataproviders.service.ts
+++ b/portal-2/src/app/services/searchDataproviders.service.ts
@@ -442,7 +442,12 @@ export class SearchDataprovidersService {
                     if(relation['to'].class == "provides" && relation['to'].type == "organization") {
                         if(getOrganizations) {
                             let item: {"name":string, "id":string} = {"name": "", "id": ""};
-                            item['name'] = relation.legalname;
+                            //item['name'] = relation.legalname;
+                            if(relation.legalshortname) {
+                              item['name'] = relation.legalshortname;
+                            } else {
+                              item['name'] = relation.legalname;
+                            }
                             item['id'] = /*OpenaireProperties.getsearchLinkToOrganization()+*/relation['to'].content;
                             organizations.push(item);
                         }
diff --git a/portal-2/src/app/services/searchProjects.service.ts b/portal-2/src/app/services/searchProjects.service.ts
index 67995607..c162220c 100644
--- a/portal-2/src/app/services/searchProjects.service.ts
+++ b/portal-2/src/app/services/searchProjects.service.ts
@@ -207,7 +207,11 @@ export class SearchProjectsService {
 
                             result['organizations'][countOrganizations]['id'] =
                                 /*OpenaireProperties.getsearchLinkToOrganization() + */relation['to'].content;
-                            result['organizations'][countOrganizations]['name'] = relation.legalname;
+                            if(relation.legalshortname) {
+                              result['organizations'][countOrganizations]['name'] = relation.legalshortname;
+                            } else {
+                              result['organizations'][countOrganizations]['name'] = relation.legalname;
+                            }
                         }
                     }
                 }