Working on MapEntryQueryService. Copied over code from other service,
code in this service must still be adapted accordingly.