Some changes start implementing MapQueryService to filter on
EntitiesRestriction
Merge remote-tracking branch 'origin/master'