item count is sum of quantity field rather than count of rows
Merge branch @JeffPyeBrook PR #647.

Fixes #646, #647.