Update #52

edited query builder