diff --git a/src/config_generator/data_service_config.py b/src/config_generator/data_service_config.py
index 787bde7..193562d 100644
--- a/src/config_generator/data_service_config.py
+++ b/src/config_generator/data_service_config.py
@@ -175,7 +175,7 @@ def _datasets(self, config, session):
                 dataset['primary_key'] = value.get('primary_key')
                 dataset['fields'] = []
 
-                meta = self.themes_reader.layer_metadata(qgs_name, value.get('layername'))
+                meta = self.themes_reader.layer_metadata(value.get('qgs_name'), value.get('layername'))
                 for key, attr_meta in meta.get('fields', {}).items():
                     if attr_meta.get('expression'):
                         # Skip expression field
diff --git a/src/config_generator/qgs_reader.py b/src/config_generator/qgs_reader.py
index ae9b449..48b8c6a 100644
--- a/src/config_generator/qgs_reader.py
+++ b/src/config_generator/qgs_reader.py
@@ -462,6 +462,7 @@ def __edit_widget_constraints(self, maplayer, field, keyvaltables):
             constraints['keyvalrel'] = self.map_prefix + "." + layerName + ":" + key + ":" + value
 
             keyvaltables[self.map_prefix + "." + layerName] = self.__table_metadata(layerSource)
+            keyvaltables[self.map_prefix + "." + layerName]['qgs_name'] = self.map_prefix
             keyvaltables[self.map_prefix + "." + layerName]['layername'] = layerName
             keyvaltables[self.map_prefix + "." + layerName]['database'] = self.__db_connection(layerSource)
             keyvaltables[self.map_prefix + "." + layerName]['fields'] = {