move uri escape/unescape to remove dependency