*8825* Add search filter; clean up status