Fix duplicate_contact reference; Fix custom values references