Adding context to bookmarks and visibility checking for cfis