You are right, having two buckets is probably the easiest way to solve this. Then when loading the page it'd ask what to do with the autosave version.