Improve reinsert bucket selection

Avoid reinserting into the same bucket if possible