AMGA-13 Bug fixes for duplicate stuff related to contacts