-modified query Builder