VID-933 Fix some whitespace, use proper template building call