Term and Date filter refactor.
Simplify TermSearch integration.
delete. Oops.