Fix spot editing
Merge pull request #1925 from leechguy/refactor_editspot_fixes

Fix spot editing