New Spawn Eggs sorting

In latest preview and snapshot spawn eggs are sorted thematically, according to the following categories:

• Overworld

  • Farm Animals

  • Mounts

  • Pets

  • Wild Animals

  • Aquatic

  • Miscellaneous

  • Golems

  • Villagers

  • Undead

  • Spiders

  • Monsters

  • Illagers

• Nether

• The End

Categorization is great, but it has some flaws. For example:
Goat is closer to a farm animal.
Llama is closer to mounts.
Mooshroom is definitely a farm animal.
Phantom is undead.

Secondly, sorting within categories is not good at all.
Horse is the most stereotypical mount, so it should go first.
Dog is the canonical pet, so it should be first in its category followed by cat since they have more common with each other than with the parrot.
Fox is related to bears, and ocelot is related to them all so they should be placed together.
Cod should be near salmon and pufferfish.
Both squids should be grouped together.
Humanoid pillagers should come before pillager creatures.

There are countless similar examples. I hope they will be fixed and maintained consistently.