Support URLs with a query string

This was only supporting the front-end EP urls
Adding comment
Merge pull request #67 from borkweb/support-urls-with-query-string

Support URLs with a query string