Adding decoding of query string names
Updated tests