Add custom list opts with all (#6992)