Update the error message to use the name of the field that is displayed

Fixes I#30435.
Merge branch '4.2/saved-search-locstring' into 4.2-trunk