more fixes to Play templates