Reworking how query parameters get added