Fix to use related parent model for some lookups