[CLOUD-30] Bugfixes in new ignore logic