[BUGFIX] Follow up foreign_match_fields not fully supported