[#302] Few more tweaks to the textual templates