Bugfix: avoid useless re-scans after incremental updates