order item count fix and tr class filters
Merge pull request #5735 from franticpsyx/2.1

order item count fix and tr class filters in 2.1.12