Fix Bookmark Issues

Hotfix to fix the issues we are seeing with bookmarks on chrome and ie.