Fix snapshots timeline bugs