Wording for capi query check
Fix merge conflict