added suport to querystring