Bug 4354 - Followup - Add row highlighting