Fix preservation of highlights after re-splitting