Fix issue with popup URL list. Still need to correctly handle ports.