Fix history navigation with Objects as choice