This should be changed in a similar way than ``query`` IMO