Fix start/end index calculations to be based off full message content node