Dynamic Distribution Groups not working with Office365 Mailboxes

Question

Ok so my problem is this. I am creating new dynamic distribution lists based on office location with the option to look at the notes section in AD and add an additional office if a user needs to be on both lists.
We have recently started using Office365 for some users and they need to get the emails too.
When I create the group initially using:
New-DynamicDistributionGroup -Name "Location-London UK" -OrganizationalUnit "domain.net/Groups/Email Groups/Locations" -RecipientContainer "domain.net/Our Users" -RecipientFilter {(RecipientType -eq 'MailUser') -or (RecipientType
-eq 'UserMailbox') -and (Office -eq 'London') -or (Notes -eq 'London')}
It creates the group limiting to the Accounts with London as their office but it includes every Office365 mailbox we have also.
There is a DDG in our EMC for an office in Hong Kong but I am not aware of who created it.
Its filter says:
((((((RecipientType -eq 'MailUser') -or (RecipientType -eq 'UserMailbox'))) -and (Office -eq 'HongKong'))) -and (-not(Name -like 'SystemMailbox{*')) -and (-not(Name -like 'CAS_{*')) -and (-not(RecipientTypeDetailsValue -eq 'MailboxPlan')) -and (-not(RecipientTypeDetailsValue
-eq 'DiscoveryMailbox')) -and (-not(RecipientTypeDetailsValue -eq 'ArbitrationMailbox')))
This group includes only the users with Hong Kong as well as Office365 users with Hong Kong as their office location
Ive tried to recreate this DG but cant as using Powershell still makes groups with the Office265 users in them.
The only way ive successfully created a London DG is by using ADSIedit to copy the msExchQueryFilter from Hong Kong to London and change the Office Name to London
Any help would be appreciated

Answer 1

For your recipient filter, use the following:
{((RecipientType -eq 'MailUser') -or (RecipientType -eq 'UserMailbox')) -and
((Office -eq 'London') -or (Notes -eq 'London'))}
See if that works ... that's effectively how the Hong Kong one is built.  Make sure you get the extra parentheses (I bolded them), they should make the difference.