Handle urls with a ' in them
Merge branch 'master' into filters