DE37400: Fix issue with field picker and SLA