More work on `Search`.

Trying to use just a `String` is a bit out of control.
Need to change to a type that more accurately describes the data.
In the middle of another refactor.

Decided to use types worth a damn.