Some changes to methods called by MapQueryService
Merge remote-tracking branch 'origin/master'