diff --git a/beacon-v2-validator-code/src/main/java/es/bsc/inb/ga4gh/beacon/validator/BeaconMetadataValidator.java b/beacon-v2-validator-code/src/main/java/es/bsc/inb/ga4gh/beacon/validator/BeaconMetadataValidator.java
index 56200ea..48b948a 100644
--- a/beacon-v2-validator-code/src/main/java/es/bsc/inb/ga4gh/beacon/validator/BeaconMetadataValidator.java
+++ b/beacon-v2-validator-code/src/main/java/es/bsc/inb/ga4gh/beacon/validator/BeaconMetadataValidator.java
@@ -134,13 +134,14 @@ public BeaconInformationalResponse parseMetadata(String json, BeaconMetadataSche
     }
 
     public String loadMetadata(String endpoint, BeaconMetadataSchema schema, ValidationObserver reporter) {
-        return loadMetadata(endpoint + ENDPOINTS.get(schema), reporter);
+        return loadMetadata(endpoint + ENDPOINTS.get(schema) + 
+                (schema == BeaconMetadataSchema.BEACON_FILTERING_TERMS_SCHEMA ? "?limit=0": ""), reporter);
     }
     
     public String loadMetadata(String endpoint, ValidationObserver reporter) {
         reporter.message(String.format("loading metadata: %s", endpoint));
         try {
-            final URI uri = new URI(endpoint + "?limit=0");
+            final URI uri = new URI(endpoint);
             if (!uri.isAbsolute()) {
                 reporter.error(new BeaconValidationMessage(
                         BeaconValidationErrorType.CONNECTION_ERROR,