Add safe values, and more comprehensively handle url encoding