SearchRefactoring: need to restart this using a similar approach than what I did for the timeline in r6141.
Authored by: cboos 2007-12-20
Parent: [r6365]
Child: [r6367]