Corrected issues which prevented correct parsing of Toolbar on xhtml pages.