Documentation and re-expression of query 2