ticket: 3 Templates fixed