Better matching on punctuation etc. To do: fix second result bug