fixing history and bookmarking issue

Tested in FF, Safari and Chrome. History in Safari no longer shows the full url.  Pages in history are no longer duplicating. Bookmarks are loading the correct pages.