Task/392 service path rest of query context

### Description
Simplified the EntityId part of the query.
Also, "added" the ServicePath path for the query.
ok, sure, why not.
The internal modification is pretty big.
Also, it alters the order of the response.