Fix issues with whitespace in template expressions
Fix issues with whitespace in template expressions

RailPhase/RailPhase,LukasBoersma/RailPhase,LukasBoersma/Web2Sharp,RailPhase/RailPhase,LukasBoersma/RailPhase,LukasBoersma/Web2Sharp