Content relations tweaks
Some changes to improve backward compatibility
Removed overwriting of edit tree link again