WP-4352 Made some adjustment to the classes used for the selectors