Fix confused test case
Allow multiple bookmarks to be shown at a point

Signed-off-by: Chris Granger <ibdknox@gmail.com>
Revise patch 96400e8fc7a3d7303715d03078350036fc6f6743

Issue #1710