diff --git a/src/main/java/org/gridsuite/network/map/NetworkMapService.java b/src/main/java/org/gridsuite/network/map/NetworkMapService.java
index a1b55460..ff63ebce 100644
--- a/src/main/java/org/gridsuite/network/map/NetworkMapService.java
+++ b/src/main/java/org/gridsuite/network/map/NetworkMapService.java
@@ -59,7 +59,7 @@ public List<String> getSubstationsIds(UUID networkUuid, String variantId, List<D
     }
 
     public AllElementsInfos getAllElementsInfos(UUID networkUuid, String variantId, List<String> substationsId) {
-        Network network = getNetwork(networkUuid, PreloadingStrategy.COLLECTION, variantId);
+        Network network = getNetwork(networkUuid, getPreloadingStrategy(substationsId), variantId);
         return AllElementsInfos.builder()
                 .substations(getSubstationsInfos(network, substationsId, InfoTypeParameters.TAB, null))
                 .voltageLevels(getVoltageLevelsInfos(network, substationsId, InfoTypeParameters.TAB, null))
@@ -194,10 +194,9 @@ public List<ElementInfos> getTieLinesInfos(Network network, List<String> substat
                 .toList();
     }
 
-    public List<ElementInfos> getBusesInfos(Network network, List<String> substationsId, InfoTypeParameters infoTypeParameters) {
-        Stream<Bus> buses = substationsId == null ? network.getBusView().getBusStream() :
-                network.getBusView().getBusStream()
-                        .filter(bus -> bus.getVoltageLevel().getSubstation().stream().anyMatch(substation -> substationsId.contains(substation.getId())))
+    public List<ElementInfos> getBusesInfos(Network network, List<String> substationsIds, InfoTypeParameters infoTypeParameters) {
+        Stream<Bus> buses = substationsIds == null ? network.getBusView().getBusStream() :
+                substationsIds.stream().flatMap(substationId -> network.getSubstation(substationId).getVoltageLevelStream().flatMap(voltageLevel -> voltageLevel.getBusView().getBusStream()))
                         .filter(Objects::nonNull)
                         .distinct();
         return buses
@@ -339,8 +338,6 @@ public Stream<? extends Connectable> getConnectableStream(Network network, Eleme
                 return network.getShuntCompensatorStream();
             case STATIC_VAR_COMPENSATOR:
                 return network.getStaticVarCompensatorStream();
-            case BUS:
-                return network.getBusbarSectionStream();
             default:
                 throw new IllegalStateException("Unexpected connectable type:" + elementType);
         }