Add diaryname table / xml form fixes