SSP-2454 Back-port DOB search label fix from 2.5.0