resolved some issues with loading history