Reworked entity id extraction from service calls