Query param null handling