Added additional criteria to DAO:Delete
Merge branch 'fix-delete-filtering' into develop