journal_id to context_id fix