Unique match replaced with RF-like clause