Modify WbdSelectProperty.java
Modify NavBarWidget.java