Feature/en 1831

Variable name could be more specific, queryString, rather than dictionary?