diff --git a/eoxserver/render/mapserver/map_renderer.py b/eoxserver/render/mapserver/map_renderer.py
index 8f650e2c..009b87f6 100644
--- a/eoxserver/render/mapserver/map_renderer.py
+++ b/eoxserver/render/mapserver/map_renderer.py
@@ -233,7 +233,8 @@ def _get_layers_plus_factories(
     ) -> List[Tuple[Layer, BaseMapServerLayerFactory]]:
         layers_plus_factories = []
         type_to_layer_factory = {}
-        for layer in render_map.layers:
+
+        for layer in render_map:
             layer_type = type(layer)
             if layer_type in type_to_layer_factory:
                 factory = type_to_layer_factory[layer_type]
diff --git a/eoxserver/services/ows/wms/layermapper.py b/eoxserver/services/ows/wms/layermapper.py
index f475c415..9c93769b 100644
--- a/eoxserver/services/ows/wms/layermapper.py
+++ b/eoxserver/services/ows/wms/layermapper.py
@@ -450,7 +450,7 @@ def lookup_layer(self, layer_name, suffix, style, filters_expressions,
                     footprints=[
                         product.footprint for product in self.iter_products(
                             eo_object, filters_expressions, sort_by,
-                            limit=limit_products
+                            limit=reader.limit_products
                         )
 
                     ],