Fix queries, wally73