Good call on adding tenant-id to the queries. I had forgotten about this.