fine tuned lookup/templating errors
Merge pull request #9646 from bcoca/listify_template_fixes

fine tuned lookup/templating errors