Domain deactivation speedup

Fixes several mistakes in domain deactivation appearing for large data sets.

Review commit-wise.

1. Feature description was added to the changelog
2. Tests covering your feature were added?
3. Any new feature or behavior change was documented? no change