order item count fix and tr class filters

Contains fixes and filters from #5662 and #5663.

Filters are needed to resolve tickets related to bundled/composited admin item count and bundled/composited line item appearance.