Fixed automatic org selection and defaulted Task to Support