rebuilt urlparse based on feedback