more fixes to the work template