Template improvements to quicksearch