Add handling of multi defined types

Replaces All Videos with multiple options