WP-3862 A few small changes related to enable/disable Add button, and checking for existing selections