National: refinements to advanced search.