Refine auto-close logic of hierarchicalopts, bug fix deploy
ARC: Template progress