Fix QuerySet._update_qs for resolving conflicts in parameters