moved logic out of extension method and into querystring builder