Tidied handling of search
Removed unused Temlate and WidgetMixin