Sure I'm a fan of shortening the list. The backend should probably be adjusted as well then as we need a correct mapping in the UI.