fix default select when from is used
Merge pull request #13344 from ccutrer/fix-from-default-select

fix default select when from is used
Improve CHANGELOG entry [ci skip]