improve organization saving

no 1-5000 additions to duplicate refs, but random keys