Request & Offer bugs fixing