improvements for fix_timeline procedure