Better handling of quotes

We should be better at handling quotes

6 Likes