explicitly pass quotationnum as an API param and other fixes, #33852