Offline inventory sync: failsafe if data is not cleared correctly

Additional improvements have been added to offline inventory to enhance performance.