TS-3147 improvements to ESI pugin