[BUG #8560] Handle active state on the list not in the items
Minor
Minor fix for templates