Template selection: cleanup by setting choices. (OMS-421)