dataset query fixed