Use filter driver to better diff changes

[ticket: X]