added advanced query builder support