Task/392 service path rest of query context

### Description
Simplified the EntityId part of the query.
Also, "added" the ServicePath path for the query.
servicePath could be common, thus, in this sense, outside the $or.

If you don't plan to implement it in this PR, I'd suggest at least include a FIXME about this in the cose, for a deferred solution.