Query fixes
.