Merge pull request from p2pu/master Release 2022-11-02 - Updates to city/place input