dot add / edit / remove ready - server fix 3