Revert field selection including language filtering to current master
code