- fix secondary index iteration returing duplicate at end (#671149) - fix rebuilddb creating duplicate indexes for first header