fix order of expected enum type  resolution (closes #2623)
allow custom filter in UnitBuilder
add unit/issues