#35 - Implemented support for query parameters in different order