History loading issues fix