WP-3053: Adjust views for new options.