Reverted templating failure due to use of ids