Fix problem with different comparisons on the same field in QueryExpressionVisitor.
Add criteria field aliasing.