fix searchconfig getcityid for internal (what a mess)
Merge branch 'moreinternalfixes' into release-149