preQuery fix