Improvements to search filters on templates