fixes for history and file name change