Remove query param from URL when its value is default (#181)

Remove query param from URL when its value is default (#181) #509