fix: make sure fill defualts and expand args for all types

fix: make sure fill defualts and expand args for all types #1381