Fold repeated query param fields into a single list

Closes #312