Issue #1922414 by SeeSchloss: Tokenized fields are handled properly. Also fixes HTML filter issues #2108193 and #2041275.