Fixed deletion bug, go to doc bug

Fix for bugs 2281, 2283.