diff --git a/pom.xml b/pom.xml
index 4b3d9a8..8acef24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
es.bsc.inb.ga4gh
beacon-framework
- 2.0.4
+ 2.0.7
diff --git a/src/main/java/es/bsc/inb/ga4gh/beacon/network/engine/BeaconNetworkResponseBuilder.java b/src/main/java/es/bsc/inb/ga4gh/beacon/network/engine/BeaconNetworkResponseBuilder.java
index 984e0c8..166ae84 100644
--- a/src/main/java/es/bsc/inb/ga4gh/beacon/network/engine/BeaconNetworkResponseBuilder.java
+++ b/src/main/java/es/bsc/inb/ga4gh/beacon/network/engine/BeaconNetworkResponseBuilder.java
@@ -310,7 +310,7 @@ protected BeaconResponseMeta getMeta(
.collect(Collectors.toList()));
}
- request_summary.setRequestedGranularity(request_query.getGranularity());
+ request_summary.setRequestedGranularity(request_query.getRequestedGranularity());
request_summary.setTestMode(request_query.getTestMode());
}
diff --git a/src/main/java/es/bsc/inb/ga4gh/beacon/network/info/BeaconFilteringTermsProducer.java b/src/main/java/es/bsc/inb/ga4gh/beacon/network/info/BeaconFilteringTermsProducer.java
index 3193228..c5a4096 100644
--- a/src/main/java/es/bsc/inb/ga4gh/beacon/network/info/BeaconFilteringTermsProducer.java
+++ b/src/main/java/es/bsc/inb/ga4gh/beacon/network/info/BeaconFilteringTermsProducer.java
@@ -186,7 +186,7 @@ private BeaconFilteringTermsResponse aggregateFilteringTerms(String scope,
if (scopes == null) {
filtering_term.setScopes(scopes = new ArrayList());
}
- if (!scopes.contains(scope)) {
+ if (scope != null && !scopes.contains(scope)) {
scopes.add(scope);
}
terms.put(id, filtering_term);