Applying some review TODO.
Un-deprecate filters. Can be figured out later.
Fixing tests and regressions.