This should be sufficient to fix the current bug on ESRI fetcher. I'm still working on adding Compensations