Better core editors override with proper filter