Change the way we switch from history to options. Related to #647 and #584