ES Template tweak to cover more cases