Advanced Search form cleanup, etc.