Query with Contains and AND/OR generates invalid query

[damieng]

Normally Or and And queries put the two operations inside an Or or And criteria. This is not valid where the criteria is the special QueryString operation:

context.Query<Product>().Query(g => g.name.Contains("a") && g.reorderLevel > 1);

{
  "query": {
    "and": [
      {
        "query_string": {
          "query": "*a*",
          "fields": [
            "name"
          ]
        }
      },
      {
        "range": {
          "reorderLevel": {
            "gt": 1
          }
        }
      }
    ]
  }
}

We should detect this and throw a better error message that indicates for an AND the condition should be moved to the filter via Where. OR is not possible.

[damieng]

Duplicate underlying cause as #37