Fix some more queries