Diaryitem form fixes