diff --git a/packages/geo/src/lib/measure/shared/index.ts b/packages/geo/src/lib/measure/shared/index.ts
index 5b2dec4152..eee66b4fdf 100644
--- a/packages/geo/src/lib/measure/shared/index.ts
+++ b/packages/geo/src/lib/measure/shared/index.ts
@@ -1,2 +1,3 @@
+export * from './measure.enum';
 export * from './measure.interfaces';
 export * from './measure.utils';
diff --git a/packages/geo/src/lib/query/shared/query.service.ts b/packages/geo/src/lib/query/shared/query.service.ts
index fb85278614..083d9840de 100644
--- a/packages/geo/src/lib/query/shared/query.service.ts
+++ b/packages/geo/src/lib/query/shared/query.service.ts
@@ -102,7 +102,11 @@ export class QueryService {
 
     return features.map((feature: Feature, index: number) => {
       let title = feature.properties[queryDataSource.queryTitle];
-      title = title ? title : layer.title;
+      if (!title && features.length > 1) {
+        title = `${layer.title} (${index + 1})`;
+      } else if (!title) {
+        title = layer.title;
+      }
       const meta = Object.assign({}, feature.meta || {}, {
         id: uuid(),
         title,