Allow disable of query param
Added license