NDL: cleaned up advanced search template.