fixed issue with url escaping