Various updates, including search enhancements.
Some rollbacks. Goodbye NJU!