For the category pathway, you could just add that code in beginning of the function HikashopBuildRoute:
if(isset($query)&& empty($query)){
unset( $query );
}
For the name, it's more complicated...Please try to change the line:
$segments[] = $name.':'.$value;
to:
if($name=='name'){
$segments[] = $value;
}else{
$segments[] = $name.':'.$value;
}
and add the line:
else $vars = $name;
after the line:
elseif($i == 2) $vars = $name;
