added URL encoding