Search: refactor to model
Character/Fandom: more model refactoring