Index container template fix