fixed #21855 list relation selection
Merge branch '21855' into 21836a
Merge pull request #988 from jrogelstad/21836a

issue #21855: Pull in fixes.