National: initial work on advanced search.