oops, that's an embarrassing templating failure (albeit mostly harmless)
Reorder some data mangling for cleanliness and appearance
Don't capitalise domain names in display