Fix selection of existing user places and new entries.
[Fixes #53553731]
Merge branch 'fix-place-selection-53553731' into develop