Set task view to completed before processing them as completed
Stop filter failing for search terms containing upper case characters
Neated up base template code