fix StraightQuery