[4.2] Always operate with query builder to prevent possible bugs