EXOGTN-1613: Fix snapshot for switch layout