Updated rql to rql2 final spec.