client: Port old HighlightRule to ExpressionMatch