Task/392 service path rest of query context

### Description
Simplified the EntityId part of the query.
Also, "added" the ServicePath path for the query.
Yeah, we could create an issue for 'Improving Speed of the broker' and this would be the first item on the list ...