Work In Progress: Improving analysis + filters view.