Added a better search template