Fixing query/builder interface