#52 change render templates logic