Added support for dots in the query string keys