[OE-2716] bugfixes for refactored contacts system