[OE-2716] contacts refactoring tweaks