Tweak around query handling.