fix(query): use explicitly the legacy behavior (#358)

fix(query): use explicitly the legacy behavior (#358) #405