Unused require
Consolidate functionality for querying bookmarks and history
Refactor from review, add lookup-caching, add tests for discovered errors (updating folders/sep)