Issue: #23853: Fixed order relation widget
more bug fixes