Fix for tooltips

Moved some code around so we are guaranteed to get tooltips in the correct order.

It wasn't obvious to me how to chunk out part of get_child_display_names into a utility function, the way the code is written now, tell me ideas if you have them