diff --git a/src/main/resources/query/02-get-gcat-configuration.json b/src/main/resources/query/02-get-gcat-configuration.json
index 5b07bfb..881e60a 100644
--- a/src/main/resources/query/02-get-gcat-configuration.json
+++ b/src/main/resources/query/02-get-gcat-configuration.json
@@ -1,30 +1,30 @@
 {
-    "@class": "Configuration",
-    "consistsOf": [
-        {
-            "@class": "IsIdentifiedBy",
-            "target": {
-                "@class": "IdentifierFacet",
-                "value": "gcat-configuration"
-            }
-        }
-    ],
-    "isRelatedTo": [
-        {
-            "@class": "IsCustomizedBy",
-            "source": {
-                "@class": "VirtualService",
-                "consistsOf": [
-                    {
-                        "@class": "IsIdentifiedBy",
-                        "target": {
-                            "@class": "SoftwareFacet",
-                            "group": "org.gcube.data-catalogue",
-                            "name": "catalogue-virtual-service"
-                        }
-                    }
-                ]
-            }
-        }
-    ]
+	"@class": "Configuration",
+	"consistsOf": [
+		{
+			"@class": "IsIdentifiedBy",
+			"target": {
+				"@class": "IdentifierFacet",
+				"value": "gcat-configuration"
+			}
+		}
+	],
+	"isRelatedTo": [
+		{
+			"@class": "IsCustomizedBy",
+			"source": {
+				"@class": "VirtualService",
+				"consistsOf": [
+					{
+						"@class": "IsIdentifiedBy",
+						"target": {
+							"@class": "SoftwareFacet",
+							"group": "org.gcube.data-catalogue",
+							"name": "catalogue-virtual-service"
+						}
+					}
+				]
+			}
+		}
+	]
 }
\ No newline at end of file
diff --git a/src/main/resources/query/03-get-simple-facet-of-gcat-configuration.json b/src/main/resources/query/03-get-simple-facet-of-gcat-configuration.json
index 08206e4..5ee9d9b 100644
--- a/src/main/resources/query/03-get-simple-facet-of-gcat-configuration.json
+++ b/src/main/resources/query/03-get-simple-facet-of-gcat-configuration.json
@@ -1,36 +1,36 @@
 {
-    "@class": "SimpleFacet",
-    "_in": {
-        "@class": "ConsistsOf",
-        "source": {
-            "@class": "Configuration",
-            "consistsOf": [
-                {
-                    "@class": "IsIdentifiedBy",
-                    "target": {
-                        "@class": "IdentifierFacet",
-                        "value": "gcat-configuration"
-                    }
-                }
-            ],
-            "isRelatedTo": [
-                {
-                    "@class": "IsCustomizedBy",
-                    "source": {
-                        "@class": "VirtualService",
-                        "consistsOf": [
-                            {
-                                "@class": "IsIdentifiedBy",
-                                "target": {
-                                    "@class": "SoftwareFacet",
-                                    "group": "org.gcube.data-catalogue",
-                                    "name": "catalogue-virtual-service"
-                                }
-                            }
-                        ]
-                    }
-                }
-            ]
-        }
-    }
+	"@class": "SimpleFacet",
+	"_in": {
+		"@class": "ConsistsOf",
+		"source": {
+			"@class": "Configuration",
+			"consistsOf": [
+				{
+					"@class": "IsIdentifiedBy",
+					"target": {
+						"@class": "IdentifierFacet",
+						"value": "gcat-configuration"
+					}
+				}
+			],
+			"isRelatedTo": [
+				{
+					"@class": "IsCustomizedBy",
+					"source": {
+						"@class": "VirtualService",
+						"consistsOf": [
+							{
+								"@class": "IsIdentifiedBy",
+								"target": {
+									"@class": "SoftwareFacet",
+									"group": "org.gcube.data-catalogue",
+									"name": "catalogue-virtual-service"
+								}
+							}
+						]
+					}
+				}
+			]
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/main/resources/query/04-get-ckan-service.json b/src/main/resources/query/04-get-ckan-service.json
index 8189b9c..bfccb4f 100644
--- a/src/main/resources/query/04-get-ckan-service.json
+++ b/src/main/resources/query/04-get-ckan-service.json
@@ -1,31 +1,31 @@
 {
-    "@class": "EService",
-    "consistsOf": [
-        {
-            "@class": "IsIdentifiedBy",
-            "target": {
-                "@class": "SoftwareFacet",
-                "group": "ckan-organization",
-                "name": "ckan"
-            }
-        }
-    ],
-    "isRelatedTo": [
-        {
-            "@class": "CallsFor",
-            "source": {
-                "@class": "VirtualService",
-                "consistsOf": [
-                    {
-                        "@class": "IsIdentifiedBy",
-                        "target": {
-                            "@class": "SoftwareFacet",
-                            "group": "org.gcube.data-catalogue",
-                            "name": "catalogue-virtual-service"
-                        }
-                    }
-                ]
-            }
-        }
-    ]
+	"@class": "EService",
+	"consistsOf": [
+		{
+			"@class": "IsIdentifiedBy",
+			"target": {
+				"@class": "SoftwareFacet",
+				"group": "ckan-organization",
+				"name": "ckan"
+			}
+		}
+	],
+	"isRelatedTo": [
+		{
+			"@class": "CallsFor",
+			"source": {
+				"@class": "VirtualService",
+				"consistsOf": [
+					{
+						"@class": "IsIdentifiedBy",
+						"target": {
+							"@class": "SoftwareFacet",
+							"group": "org.gcube.data-catalogue",
+							"name": "catalogue-virtual-service"
+						}
+					}
+				]
+			}
+		}
+	]
 }
\ No newline at end of file
diff --git a/src/main/resources/query/05-get-access-point-facet-of-ckan-service.json b/src/main/resources/query/05-get-access-point-facet-of-ckan-service.json
index 010ed40..2cc1960 100644
--- a/src/main/resources/query/05-get-access-point-facet-of-ckan-service.json
+++ b/src/main/resources/query/05-get-access-point-facet-of-ckan-service.json
@@ -1,37 +1,37 @@
 {
-    "@class": "AccessPointFacet",
-    "_in": {
-        "@class": "ConsistsOf",
-        "source": {
-            "@class": "EService",
-            "consistsOf": [
-                {
-                    "@class": "IsIdentifiedBy",
-                    "target": {
-                        "@class": "SoftwareFacet",
-                        "group": "ckan-organization",
-                        "name": "ckan"
-                    }
-                }
-            ],
-            "isRelatedTo": [
-                {
-                    "@class": "CallsFor",
-                    "source": {
-                        "@class": "VirtualService",
-                        "consistsOf": [
-                            {
-                                "@class": "IsIdentifiedBy",
-                                "target": {
-                                    "@class": "SoftwareFacet",
-                                    "group": "org.gcube.data-catalogue",
-                                    "name": "catalogue-virtual-service"
-                                }
-                            }
-                        ]
-                    }
-                }
-            ]
-        }
-    }
+	"@class": "AccessPointFacet",
+	"_in": {
+		"@class": "ConsistsOf",
+		"source": {
+			"@class": "EService",
+			"consistsOf": [
+				{
+					"@class": "IsIdentifiedBy",
+					"target": {
+						"@class": "SoftwareFacet",
+						"group": "ckan-organization",
+						"name": "ckan"
+					}
+				}
+			],
+			"isRelatedTo": [
+				{
+					"@class": "CallsFor",
+					"source": {
+						"@class": "VirtualService",
+						"consistsOf": [
+							{
+								"@class": "IsIdentifiedBy",
+								"target": {
+									"@class": "SoftwareFacet",
+									"group": "org.gcube.data-catalogue",
+									"name": "catalogue-virtual-service"
+								}
+							}
+						]
+					}
+				}
+			]
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/main/resources/query/06-get-postgres-ckan-db.json b/src/main/resources/query/06-get-postgres-ckan-db.json
index e7c3794..ea692c7 100644
--- a/src/main/resources/query/06-get-postgres-ckan-db.json
+++ b/src/main/resources/query/06-get-postgres-ckan-db.json
@@ -1,49 +1,49 @@
 {
-    "@class": "EService",
-    "consistsOf": [
-        {
-            "@class": "IsIdentifiedBy",
-            "target": {
-                "@class": "SoftwareFacet",
-                "group": "org.postgresql",
-                "name": "postgresql"
-            }
-        }
-    ],
-    "isRelatedTo": [
-        {
-            "@class": "Uses",
-            "source": {
-                "@class": "EService",
-                "consistsOf": [
-                    {
-                        "@class": "IsIdentifiedBy",
-                        "target": {
-                            "@class": "SoftwareFacet",
-                            "group": "ckan-organization",
-                            "name": "ckan"
-                        }
-                    }
-                ],
-                "isRelatedTo": [
-                    {
-                        "@class": "CallsFor",
-                        "source": {
-                            "@class": "VirtualService",
-                            "consistsOf": [
-                                {
-                                    "@class": "IsIdentifiedBy",
-                                    "target": {
-                                        "@class": "SoftwareFacet",
-                                        "group": "org.gcube.data-catalogue",
-                                        "name": "catalogue-virtual-service"
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                ]
-            }
-        }
-    ]
+	"@class": "EService",
+	"consistsOf": [
+		{
+			"@class": "IsIdentifiedBy",
+			"target": {
+				"@class": "SoftwareFacet",
+				"group": "org.postgresql",
+				"name": "postgresql"
+			}
+		}
+	],
+	"isRelatedTo": [
+		{
+			"@class": "Uses",
+			"source": {
+				"@class": "EService",
+				"consistsOf": [
+					{
+						"@class": "IsIdentifiedBy",
+						"target": {
+							"@class": "SoftwareFacet",
+							"group": "ckan-organization",
+							"name": "ckan"
+						}
+					}
+				],
+				"isRelatedTo": [
+					{
+						"@class": "CallsFor",
+						"source": {
+							"@class": "VirtualService",
+							"consistsOf": [
+								{
+									"@class": "IsIdentifiedBy",
+									"target": {
+										"@class": "SoftwareFacet",
+										"group": "org.gcube.data-catalogue",
+										"name": "catalogue-virtual-service"
+									}
+								}
+							]
+						}
+					}
+				]
+			}
+		}
+	]
 }
\ No newline at end of file
diff --git a/src/main/resources/query/07-get-access-point-facet-of-postgres-ckan-db.json b/src/main/resources/query/07-get-access-point-facet-of-postgres-ckan-db.json
index 537ff45..ede06dd 100644
--- a/src/main/resources/query/07-get-access-point-facet-of-postgres-ckan-db.json
+++ b/src/main/resources/query/07-get-access-point-facet-of-postgres-ckan-db.json
@@ -1,55 +1,55 @@
 {
-    "@class": "AccessPointFacet",
-    "_in": {
-        "@class": "ConsistsOf",
-        "source": {
-            "@class": "EService",
-            "consistsOf": [
-                {
-                    "@class": "IsIdentifiedBy",
-                    "target": {
-                        "@class": "SoftwareFacet",
-                        "group": "org.postgresql",
-                        "name": "postgresql"
-                    }
-                }
-            ],
-            "isRelatedTo": [
-                {
-                    "@class": "Uses",
-                    "source": {
-                        "@class": "EService",
-                        "consistsOf": [
-                            {
-                                "@class": "IsIdentifiedBy",
-                                "target": {
-                                    "@class": "SoftwareFacet",
-                                    "group": "ckan-organization",
-                                    "name": "ckan"
-                                }
-                            }
-                        ],
-                        "isRelatedTo": [
-                            {
-                                "@class": "CallsFor",
-                                "source": {
-                                    "@class": "VirtualService",
-                                    "consistsOf": [
-                                        {
-                                            "@class": "IsIdentifiedBy",
-                                            "target": {
-                                                "@class": "SoftwareFacet",
-                                                "group": "org.gcube.data-catalogue",
-                                                "name": "catalogue-virtual-service"
-                                            }
-                                        }
-                                    ]
-                                }
-                            }
-                        ]
-                    }
-                }
-            ]
-        }
-    }
+	"@class": "AccessPointFacet",
+	"_in": {
+		"@class": "ConsistsOf",
+		"source": {
+			"@class": "EService",
+			"consistsOf": [
+				{
+					"@class": "IsIdentifiedBy",
+					"target": {
+						"@class": "SoftwareFacet",
+						"group": "org.postgresql",
+						"name": "postgresql"
+					}
+				}
+			],
+			"isRelatedTo": [
+				{
+					"@class": "Uses",
+					"source": {
+						"@class": "EService",
+						"consistsOf": [
+							{
+								"@class": "IsIdentifiedBy",
+								"target": {
+									"@class": "SoftwareFacet",
+									"group": "ckan-organization",
+									"name": "ckan"
+								}
+							}
+						],
+						"isRelatedTo": [
+							{
+								"@class": "CallsFor",
+								"source": {
+									"@class": "VirtualService",
+									"consistsOf": [
+										{
+											"@class": "IsIdentifiedBy",
+											"target": {
+												"@class": "SoftwareFacet",
+												"group": "org.gcube.data-catalogue",
+												"name": "catalogue-virtual-service"
+											}
+										}
+									]
+								}
+							}
+						]
+					}
+				}
+			]
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/main/resources/query/08-get-solr-service.json b/src/main/resources/query/08-get-solr-service.json
index 7fb93ec..4830884 100644
--- a/src/main/resources/query/08-get-solr-service.json
+++ b/src/main/resources/query/08-get-solr-service.json
@@ -1,49 +1,49 @@
 {
-    "@class": "EService",
-    "consistsOf": [
-        {
-            "@class": "IsIdentifiedBy",
-            "target": {
-                "@class": "SoftwareFacet",
-                "group": "org.apache.solr",
-                "name": "solr"
-            }
-        }
-    ],
-    "isRelatedTo": [
-        {
-            "@class": "Uses",
-            "source": {
-                "@class": "EService",
-                "consistsOf": [
-                    {
-                        "@class": "IsIdentifiedBy",
-                        "target": {
-                            "@class": "SoftwareFacet",
-                            "group": "ckan-organization",
-                            "name": "ckan"
-                        }
-                    }
-                ],
-                "isRelatedTo": [
-                    {
-                        "@class": "CallsFor",
-                        "source": {
-                            "@class": "VirtualService",
-                            "consistsOf": [
-                                {
-                                    "@class": "IsIdentifiedBy",
-                                    "target": {
-                                        "@class": "SoftwareFacet",
-                                        "group": "org.gcube.data-catalogue",
-                                        "name": "catalogue-virtual-service"
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                ]
-            }
-        }
-    ]
+	"@class": "EService",
+	"consistsOf": [
+		{
+			"@class": "IsIdentifiedBy",
+			"target": {
+				"@class": "SoftwareFacet",
+				"group": "org.apache.solr",
+				"name": "solr"
+			}
+		}
+	],
+	"isRelatedTo": [
+		{
+			"@class": "Uses",
+			"source": {
+				"@class": "EService",
+				"consistsOf": [
+					{
+						"@class": "IsIdentifiedBy",
+						"target": {
+							"@class": "SoftwareFacet",
+							"group": "ckan-organization",
+							"name": "ckan"
+						}
+					}
+				],
+				"isRelatedTo": [
+					{
+						"@class": "CallsFor",
+						"source": {
+							"@class": "VirtualService",
+							"consistsOf": [
+								{
+									"@class": "IsIdentifiedBy",
+									"target": {
+										"@class": "SoftwareFacet",
+										"group": "org.gcube.data-catalogue",
+										"name": "catalogue-virtual-service"
+									}
+								}
+							]
+						}
+					}
+				]
+			}
+		}
+	]
 }
\ No newline at end of file
diff --git a/src/main/resources/query/09-get-access-point-facet-of-solr-service.json b/src/main/resources/query/09-get-access-point-facet-of-solr-service.json
index c607fbb..21d4638 100644
--- a/src/main/resources/query/09-get-access-point-facet-of-solr-service.json
+++ b/src/main/resources/query/09-get-access-point-facet-of-solr-service.json
@@ -1,55 +1,55 @@
 {
-    "@class": "AccessPointFacet",
-    "_in": {
-        "@class": "ConsistsOf",
-        "source": {
-            "@class": "EService",
-            "consistsOf": [
-                {
-                    "@class": "IsIdentifiedBy",
-                    "target": {
-                        "@class": "SoftwareFacet",
-                        "group": "org.apache.solr",
-                        "name": "solr"
-                    }
-                }
-            ],
-            "isRelatedTo": [
-                {
-                    "@class": "Uses",
-                    "source": {
-                        "@class": "EService",
-                        "consistsOf": [
-                            {
-                                "@class": "IsIdentifiedBy",
-                                "target": {
-                                    "@class": "SoftwareFacet",
-                                    "group": "ckan-organization",
-                                    "name": "ckan"
-                                }
-                            }
-                        ],
-                        "isRelatedTo": [
-                            {
-                                "@class": "CallsFor",
-                                "source": {
-                                    "@class": "VirtualService",
-                                    "consistsOf": [
-                                        {
-                                            "@class": "IsIdentifiedBy",
-                                            "target": {
-                                                "@class": "SoftwareFacet",
-                                                "group": "org.gcube.data-catalogue",
-                                                "name": "catalogue-virtual-service"
-                                            }
-                                        }
-                                    ]
-                                }
-                            }
-                        ]
-                    }
-                }
-            ]
-        }
-    }
+	"@class": "AccessPointFacet",
+	"_in": {
+		"@class": "ConsistsOf",
+		"source": {
+			"@class": "EService",
+			"consistsOf": [
+				{
+					"@class": "IsIdentifiedBy",
+					"target": {
+						"@class": "SoftwareFacet",
+						"group": "org.apache.solr",
+						"name": "solr"
+					}
+				}
+			],
+			"isRelatedTo": [
+				{
+					"@class": "Uses",
+					"source": {
+						"@class": "EService",
+						"consistsOf": [
+							{
+								"@class": "IsIdentifiedBy",
+								"target": {
+									"@class": "SoftwareFacet",
+									"group": "ckan-organization",
+									"name": "ckan"
+								}
+							}
+						],
+						"isRelatedTo": [
+							{
+								"@class": "CallsFor",
+								"source": {
+									"@class": "VirtualService",
+									"consistsOf": [
+										{
+											"@class": "IsIdentifiedBy",
+											"target": {
+												"@class": "SoftwareFacet",
+												"group": "org.gcube.data-catalogue",
+												"name": "catalogue-virtual-service"
+											}
+										}
+									]
+								}
+							}
+						]
+					}
+				}
+			]
+		}
+	}
 }
\ No newline at end of file