Added searches add/remove.
Tidy.