Multiple Names

I have two challenges I am trying to resolve:

How to work with multiple names as the author: for example “Juniper Research” If I enter it with a double comma “Juniper,Research”, the result in my in text reference is “(Juniper, DATE)” I would prefer this to read (Juniper Research, DATE).

The second is with a company name like Marks & Spencer if I enter it in as “Marks,& Spencer” my in text result is “(Marks, DATE)” I would prefer this to read (Marks and Spencer, DATE).

Would you be able to put me onto a search string that can help?

In both of those instances you want a single trailing comma, not a double comma where there never was one?