Made the 'fieldName/value(s)' parsing more flexible and improved the field value parsing in anticipation of the AND and OR clauses that will be written next.