added redirect match support