National: minor improvements to advanced search.