Be more flexible with video grouping and update the dictionary