Review splitting references logic

[lizgzil]

The decision to split up references at a b-r tag and end at the next e-r tag should be reviewed and different approaches should be considered and tested. This is implemented here.