Initial popup support
Correcting uri for popup requests