Refactored BookmarkSearcher