[OE-3856] audit trimming migration bugfixes