Query builder fix.