History and bookmarking working again