WP-3384 Changed values to be "Yes" or "No"