Change TemplateEngine into CDI managed bean.
Leave only essential fields in add-match form.
Add match type picker as first step in adding match process.