Better and Better and Better ... performance on filters scan
Backports better perf on standard dashboard