List Template fix and comments