Fix an issue with space and area forms where editing a model would create a new one