(Mostly) handle cursor positioning around multiple bookmarks in same position

Closes #1726