#424 fixed query example