Issue 19453: Added fields for advanced search.