more query adjustments