Tweaks for rawquery