Tweak more queries