Fix site/current default relations