Allow searching on remaining user location fields

These fields became illegal in 1042719; add them back, as they do not
present a security risk.

Resolves I#26960.
Merge branch '4.2/user-location-fields' into 4.2-trunk