What I do is keep the tokens in sleeves that match the color of the token. Soldiers in white sleeves, Snakes in Green, Satyrs in Gold, etc
Cuts down on search time a fair bit, though unless you literally do the work for people you're never going to reach everybody