More Add Request fixes Part 2