1. updated work items manipulation logic
2. skip Zafira update if workItem is NULL