Bugfix/toggle relationships