Support URLs with a query string

This was only supporting the front-end EP urls