fixed FKs in annotations