Mapped fields now have a function to construct a query condition.
Splitting of query terms improved