Fixed template string issues