resolve RFQ related issues