return param fix for Gateway and Location list generation