Minor text changes to templates
Fix bug in Search Task Model