Better query interpolation