WP-3609 Added search fields