Fix/timelines second level grouping 4887