move the expression context in the weight, not in the query