fixes

- reverted conditional count back to forEach where arrays are mixed