worker: fixing add/edit issues;