Merge pull request #24811 from rohitwaghchaure/minor-fixes-for-work-order

fix: minor changes in work order