Probably fixed the rest of bookmark bugs