Fix issues with unnecessary task deletion #70

Closed
charithag wants to merge 2 commits from improvement/fix-task-deletion into master