Another tweak for bug #8139.  It now accepts the GatewayKey filter properly.