Updates to Lister and InputfieldSelector to enhance template context awareness