WCM-17 improve UI of gender rule