WP-2702 Changed the list of options