New filter name, and we always have the payment ID. See #339, See #319