Merchandise returns and QueuedEmails in a Guest customer displays those of all Guest customers

[Nikhil13x]

When we open a guest customer and go to Activity Log or Merchandise Returns tab, we could see the data from all the other guest customers as well. In case of Queued Emails, it lists down all unsent emails.
On inspecting the code, found that, the query is using EmailAddress to fetch records and for all Guest Customers, it will be empty.
Ideally, the query can be using the customerId, so that the data gets filtered properly