Add wildcard outputfield expansion logic back (#604)

Add wildcard outputfield expansion logic back (#604) #697