even more queries patched up