Case 2529 - Modified bookmarks to work with no-js.
Merge branch 'case-2529' into develop

* case-2529:
  Case 2529 - Modified bookmarks to work with no-js.