UC-30 Don't blindly add '?' to URLs