Fix term counts when terms span taxonomies Closes #4738
Changelog bump for ##4738