Improved grid, improved performance, improved filtering