DNN-4432 Handle popups for URLs that already have a query string (Pull Request #31)