Add dynamic url generation; add URI escaping