improve test to bug with AND OR expression
fix bug with expression for fields without pattern