Apple Mail VIP Mailbox not working Properly after El Capitan Update

I have recently update to El Capitan and have noticed that my VIP mailboxes in Apple Mail are not collecting as usual.

Some mailboxes have no email and others have only 2 and the maximum is 6.

I have unselected each VIP and reselected them. This didn't make a change. I launched the application. Still nothing. I restarted the computer, same result....nothing.

On my iPhone, all of the emails are in the VIP mailboxes. When I look at the inbox on the server (our company uses gmail as the host), all of the emails are there.

I can search inside the "Inbox" (not VIP Inbox) and find the emails no problem, but that's not what I've been doing for years with VIP.

Is anyone else having this problem? Do you know of a fix?

Any help will be appreciated.

Thank you.