Search - "refactoring nightmare"