Refactoring of BookmarkSearcher