Various improvements while submitting task