(DNN-4432) handle popups for URLs that already have a query string

handle popups for URLs that already have a query string (don't hardcode the question mark)