Using standardised way of encoding URLs, Closing #691