Fix up more query doodads