Step by step. When you have two "All Entries". Go to "Settings", drop down to "Roster Group Table Association". In the block marked "Select Roster Group:" You will see all the Groups. And it's there that you see both "All Entries". Click on each, and check them all so that you will have two complete groups, with all your locos in each. Then, go back and uncheck one set of "All Entries", leaving the other set still checked. Now, when you go to the main page again, go to "File" and "Rebuild Roster". That gets you just one "All Entries".
And that's how I did it. I didn't need to restart. But you might have to.
Morgan Bilbo