Fix adding zone info on Cursor.fetch
Avoid additional forEach info
Merge branch 'bug-fixes'