Fix queries and results