As, um, neat as the Grand Menagerie is in theory, in practice it is either useless, or annoying, or on very rare occasion, a happy anomaly.
I'd much rather see it reworked into something more genuinely useful. Perhaps a wonder with the prereq of any, oh, say, two or three animals, and make...