Fix inconsistencies with saving last selected base