ADEN-308 add query string as the env variable