Raw query support seems to finally be working