Improved advanced search template