Improved how URI's are generated if they have query args