Changed suggestion handling to better remove suggestions after the comma