Improved deleting plot query
Random refactoring
Fixed plots storing