[2.0.0] Query builder interface updae

Small fix