Better filtering.  Accounting for '' blank production type for #131