Implemented querystring and license filtering