Filtering to work in non-deferred mode, fix #1565