Post pr merge fixes

[shabegom]

• Fixes all the issues I caused by blindly merging all the old PRs.
• Adds the new Templater processing logic