After updating to iOS11, I am getting emails in mail folders that I haven't selected

I have about 40 email folders in my Exchange mailbox. I have selected about 15 of them to push email to me (Settings->Acconts & Passwords->Fetch New Data->Exchange. Push is selected and 15 folders have a checkmark next to them).

When I open my mail I see a mail count against all 40 of my folders, I only want to see mail in my 15 selected folders. This has been working for years but after I upgraded to iOS11 I now get notifications in all folders