Bugfixes for rare crash
Add completion when deleting only locally. Fixes bugs.