Fix _queries */*