CF-147: Fix fatal errors on agenda/e/add
Merge branch 'feature/CF-147' into feature/culturefeed_entry_ui