Attempt to fix #47, there are still stragne behaviours with introduced &amp; for urls but it is fixed for now.