Better handling of quotes