WP-3056 Removed references to deleted fields from the search field