search template improvements