Add filter field; comment some tests
Refactoring; move to ajax update/highlight