Change filter to avoid bug in widgets