Query domain service to make it easier to fill the form
Small fix for undefined DS set