diff --git a/edi_core_oca/views/edi_exchange_type_views.xml b/edi_core_oca/views/edi_exchange_type_views.xml
index 67c2e97c1..2ab11c2eb 100644
--- a/edi_core_oca/views/edi_exchange_type_views.xml
+++ b/edi_core_oca/views/edi_exchange_type_views.xml
@@ -72,43 +72,48 @@
                     </group>
                     <notebook>
                         <page name="exec_handlers" string="Execution handlers">
-                            <group
-                                name="input_handlers"
-                                invisible="direction != 'input'"
-                            >
-                                <field
-                                    name="receive_model_id"
-                                    options="{'no_create': True}"
-                                />
-                                <field
-                                    name="process_model_id"
-                                    options="{'no_create': True}"
-                                />
-                                <field
-                                    name="input_validate_model_id"
-                                    options="{'no_create': True}"
-                                />
-                            </group>
-                            <group
-                                name="output_handlers"
-                                invisible="direction != 'output'"
-                            >
-                                <field
-                                    name="generate_model_id"
-                                    options="{'no_create': True}"
-                                />
-                                <field
-                                    name="send_model_id"
-                                    options="{'no_create': True}"
-                                />
-                                <field
-                                    name="output_validate_model_id"
-                                    options="{'no_create': True}"
-                                />
-                                <field
-                                    name="check_model_id"
-                                    options="{'no_create': True}"
-                                />
+                            <group name="handlers_row">
+                                <group name="handlers_left">
+                                    <field
+                                        name="receive_model_id"
+                                        invisible="direction != 'input'"
+                                        options="{'no_create': True}"
+                                    />
+                                    <field
+                                        name="process_model_id"
+                                        invisible="direction != 'input'"
+                                        options="{'no_create': True}"
+                                    />
+                                    <field
+                                        name="input_validate_model_id"
+                                        invisible="direction != 'input'"
+                                        options="{'no_create': True}"
+                                    />
+                                    <field
+                                        name="generate_model_id"
+                                        invisible="direction != 'output'"
+                                        options="{'no_create': True}"
+                                    />
+                                    <field
+                                        name="send_model_id"
+                                        invisible="direction != 'output'"
+                                        options="{'no_create': True}"
+                                    />
+                                    <field
+                                        name="output_validate_model_id"
+                                        invisible="direction != 'output'"
+                                        options="{'no_create': True}"
+                                    />
+                                    <field
+                                        name="check_model_id"
+                                        invisible="direction != 'output'"
+                                        options="{'no_create': True}"
+                                    />
+                                </group>
+                                <!-- Extension point: handler-specific modules
+                                     (eg. edi_webservice_oca) inject their own
+                                     settings here as a right-side column. -->
+                                <group name="handlers_right" />
                             </group>
                         </page>
                         <page
diff --git a/edi_webservice_oca/components/send.py b/edi_webservice_oca/components/send.py
index e42e345f7..43d7f12fd 100644
--- a/edi_webservice_oca/components/send.py
+++ b/edi_webservice_oca/components/send.py
@@ -2,6 +2,8 @@
 # @author: Simone Orsi <simahawk@gmail.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
+from requests import Response
+
 from odoo import _, exceptions
 
 from odoo.addons.component.core import Component
@@ -27,7 +29,13 @@ def __init__(self, work_context):
 
     def send(self):
         method, pargs, kwargs = self._get_call_params()
-        return self.webservice_backend.call(method, *pargs, **kwargs)
+        response = self.exchange_record.backend_id.webservice_backend_id.call(
+            method, *pargs, **kwargs
+        )
+        if not isinstance(response, Response):
+            # backward compat for obsolete `content_only` param
+            return response
+        return response.content
 
     def _get_call_params(self):
         try: