Simplified the display filtering a lot