Fix queries made from command classes