Damn it. I really should get round to fix displaying content based on content-type properly....