Fixed the parameter handling for passing uniqueid