Move querystring tools to separate local module