Improve handling of pending assets in timeline