Fixing issue related due to bad performance when navigating through history.