Same point here about moving this filter before `match_client`.