diff --git a/shared/workspaces/src/workspaces/services.py b/shared/workspaces/src/workspaces/services.py
index dfb53c99e5e2b9939ce8ce33614493b22db54f33..ddadd798bde7e80879ed54a8f49522868588adf5 100644
--- a/shared/workspaces/src/workspaces/services.py
+++ b/shared/workspaces/src/workspaces/services.py
@@ -127,7 +127,7 @@ class CapabilityService(CapabilityServiceIF):
         queue
         """
         request = self.capability_info.lookup_entity(
-            CapabilityRequest, execution_record.capability_request
+            execution_record.capability_request_id, CapabilityRequest
         )
         capability = self.capability_info.lookup_entity(Capability, request.capability)
 
@@ -249,7 +249,7 @@ class CapabilityInfo(CapabilityInfoIF):
         :return: Object representation of entity if found, else None
         """
         return (
-            self.session.query(entity_schema)
+            self.session.query(entity_schema.__class__)
             .filter(entity_schema.id == entity_id)
             .one()
         )