Fixed array property forEach bug and applied same pattern to another place.
All tests passed EXCEPT those that didn't pass before
INCLUDING "query:orderBy 2 fields" which fails for unrelated reasons