Fix bug with category generation
Update default template