fix polymorphic relation issues
change-o-rama, Record work almost done