Task/392 service path rest of query context

### Description
Simplified the EntityId part of the query.
Also, "added" the ServicePath path for the query.
After the big refacting... are entFalseWType and entFalseWOType actually used? If not, let's remove them.