diff --git a/src/app/search/search.component.ts b/src/app/search/search.component.ts
index a62bddb9c6a2040d7730374865ae4b1d0bef95fa..41639e47da817627c2d8b38b2eab7e11989da016 100644
--- a/src/app/search/search.component.ts
+++ b/src/app/search/search.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { ParseXmlService } from '../services/parse-xml.service';
 import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
+import { environment } from 'src/environments/environment.prod';
 
 
 export interface formData{
@@ -49,6 +50,7 @@ export class SearchComponent implements OnInit {
               where {\n\?dataset a dcat:Dataset ;\n\
                         dcterms:title ?title ;\n\
                         dcterms:description ?description; \n\
+                        dcterms:isPartOf* <'+ environment.fdpUrl +'>;\n\
                         dcat:keyword ?uri ; \n\
                         FILTER (contains( ?description, "' + 
                         term +'") || contains( ?title, "'+ term +'"))\n\.\n\
diff --git a/src/app/stats/stats.component.ts b/src/app/stats/stats.component.ts
index fdd8603f5f74f14443322ed034d76e3030fd7015..698c4e2d21c2b1991e94836b7ec83c05d44ab3dc 100644
--- a/src/app/stats/stats.component.ts
+++ b/src/app/stats/stats.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { ParseXmlService } from '../services/parse-xml.service';
+import { environment } from 'src/environments/environment';
 
 
 @Component({
@@ -17,11 +18,19 @@ export class StatsComponent implements OnInit {
 
   ngOnInit(): void {
 
-      let query1='query=SELECT (COUNT(?s) AS ?triples) WHERE { ?s a <http://www.w3.org/ns/dcat#Catalog> }'
+      let query1='query=prefix dct: <http://purl.org/dc/terms/>\n\
+      SELECT (COUNT(?s) AS ?triples) \n\
+      WHERE { ?s a <http://www.w3.org/ns/dcat#Catalog>;\n\
+              dct:isPartOf <https://f2ds.eosc-pillar.eu>\n\
+            }'
       this.parserService.getXmlResult(query1).subscribe(data=>{if (data){this.results = []; data.results.bindings.forEach(element => { this.results.push(element);});
       this.stats.push(this.results[0]["triples"].value)
 
-      let query2='query=SELECT (COUNT(?s) AS ?triples) WHERE { ?s a <http://www.w3.org/ns/dcat#Dataset> }'
+      let query2='query=prefix dct: <http://purl.org/dc/terms/>\n\
+      SELECT (COUNT(?s) AS ?triples) \n\
+      WHERE { ?s a <http://www.w3.org/ns/dcat#Dataset>;\n\
+              dct:isPartOf <'+ environment.fdpUrl +'>\n\
+            }'
       this.parserService.getXmlResult(query2).subscribe(data=>{if (data){this.results = []; data.results.bindings.forEach(element => { this.results.push(element);});
       this.stats.push(this.results[0]["triples"].value); }})