Refactored dictionary search into class
Refactored bookmarks sets into class, added general dispath for matcher