diff --git a/src/context/service/database/ConfigRule.py b/src/context/service/database/ConfigRule.py
index d9f6b06cb743a6268fd604c6b5185952c9268f58..04d6b837ffafc3338c5aab43b3ee2ad6014950d9 100644
--- a/src/context/service/database/ConfigRule.py
+++ b/src/context/service/database/ConfigRule.py
@@ -38,6 +38,9 @@ def compose_config_rules_data(
     dict_config_rules : List[Dict] = list()
     for position,config_rule in enumerate(config_rules):
         str_kind = config_rule.WhichOneof('config_rule')
+        if device_uuid is not None and str_kind == 'custom':
+            if '/inventory' in config_rule.custom.resource_key:
+                continue
         kind = ConfigRuleKindEnum._member_map_.get(str_kind.upper()) # pylint: disable=no-member
         dict_config_rule = {
             'position'  : position,
diff --git a/src/context/service/database/Device.py b/src/context/service/database/Device.py
index 89bb63d6c16b18809100419350cf41626c2ea77e..145d917afa28c99e6f7a4e8a2cfcc634703f34c1 100644
--- a/src/context/service/database/Device.py
+++ b/src/context/service/database/Device.py
@@ -343,7 +343,7 @@ def device_select(db_engine : Engine, request : DeviceFilter) -> DeviceList:
         query = session.query(DeviceModel)
         if request.include_endpoints   : query = query.options(selectinload(DeviceModel.endpoints))
         if request.include_config_rules: query = query.options(selectinload(DeviceModel.config_rules))
-        #if request.include_components  : query = query.options(selectinload(DeviceModel.components))
+        if request.include_components  : query = query.options(selectinload(DeviceModel.components))
         obj_list : List[DeviceModel] = query.filter(DeviceModel.device_uuid.in_(device_uuids)).all()
         return [obj.dump(**dump_params) for obj in obj_list]
     devices = run_transaction(sessionmaker(bind=db_engine), callback)