Improved filtering and table view.