Correctly handle request/remove location requests (XP3)