Fix test_advanced_search_fields test.  Fixes #1416