Had a meeting with MJ to look at the last few remaining problems. It looks as though the character encoding issue in the search form may just be a question of starting up Tomcat with UTF-8. Other display issues look like they may be related to extra whitespace in the XML, caused either by the expansion of entities, or by errors or laxness in the original markup. In any case, they may be fixable by judicious use of <xsl:strip-space> combined with <xsl:preserve-space>. Hoping to get this port finished by the end of the week.