fixed #MBL-10555 Re factored how the notes resolves the context nav histo...

...ry.