Enhance dynamic tap location persistence to support duplicate locs