Update after release of Private Bookmarks

- Fix two issues with private bookmarks exposing data.
- Update query for with_content to work properly.
- Update tests to make bookmarks public by default.
- Updates from production during release process.