working: metadata refactor, library/search