small tweaks on the issue tpl