Started adding diagrams, fixing search generic XML renderer issues