[BUGFIX] foreign_match_fields not fully supported