GPII-270: improved the proxy match handler.