Issue #155 - Use a single map old,new survey id across groups