reverting accidentally breaking some queries