Replace manual indent by indent parameter of template; Bugfixing