Improve string and date templates #561