Restore correct behaviour for --select-pmts
rework PID remap for dynamic changes + /newsid=
Merge remote-tracking branch 'upstream/master'