SSP-2613 Fix potentially inexact client-side CL ID/name matching