Pick a better buffer to switch to when archiving/deleting, closes #125