Change SelectQuery to QueryBuilder