This update will resolve issue 5, where there is no page information so the highlight is formatted with 'at' instead of 'on'.