Should now properly match logical expressions like and(...), or(...) instead of and/or without parenthesis, this should fix the issue with fields that start with or/and