Fixing the map issues in activities/audience