IDE-1498 fixed ids in templates