[Fixed] some items not being destroyed from db when they should

Change-Id: I42408b1e8987951f9dc9707e676714d3e0c0e79d