add suport for query strings