MapQueryService aka MapCatalogEntryQuery changes and transform class