Actually use querystring param

Change-Id: Ica446dd7cdcc3215ae131944a061516dbc1afc4d