tpl fixes for category
0.0.20-18