Clean up make url function. Review field format and fix bug.