Make fetcher handle entitites when reverse mapping