Fix logic to add hilite class