ticket:8 fixes according to coments
Merge branch 't8_templatetag'.With fixes.