add field mapping support for and()/or(), fixes #2237