diff --git a/param.c b/param.c
index b3d55a2..d508c4d 100644
--- a/param.c
+++ b/param.c
@@ -173,13 +173,12 @@ cString GetTransponderUrlParameters(const cChannel *channelP)
      ST("C  2") q += PrintUrlString(q, STBUFLEFT, dtp.Bandwidth(),    SatipBandwidthValues);
      ST("  T*") q += PrintUrlString(q, STBUFLEFT, dtp.Guard(),        SatipGuardValues);
      ST("CST*") q += PrintUrlString(q, STBUFLEFT, dtp.CoderateH(),    SatipCodeRateValues);
-     ST(" S 1") q += snprintf(q,       STBUFLEFT, "&plts=off");       // SAT>IP protocol specification 1.2.2
+     ST(" S 1") q += PrintUrlString(q, STBUFLEFT, PILOT_OFF,          SatipPilotValues); // SAT>IP protocol specification 1.2.2
      ST(" S 2") q += PrintUrlString(q, STBUFLEFT, dtp.Pilot(),        SatipPilotValues);
-     ST(" S 1") q += snprintf(q,       STBUFLEFT, "&mtype=qpsk");     // SAT>IP protocol specification 1.2.2
-     ST(" S 2") q += PrintUrlString(q, STBUFLEFT, dtp.Modulation(),   SatipModulationValues);
+     ST(" S *") q += PrintUrlString(q, STBUFLEFT, dtp.Modulation(),   SatipModulationValues); // SAT>IP protocol specification 1.2.2
      ST("  T*") q += PrintUrlString(q, STBUFLEFT, dtp.Modulation(),   SatipModulationValues);
      ST("C  1") q += PrintUrlString(q, STBUFLEFT, dtp.Modulation(),   SatipModulationValues);
-     ST(" S 1") q += snprintf(q,       STBUFLEFT, "&ro=0.35");        // SAT>IP protocol specification 1.2.2
+     ST(" S 1") q += PrintUrlString(q, STBUFLEFT, ROLLOFF_35,         SatipRollOffValues); // SAT>IP protocol specification 1.2.2
      ST(" S 2") q += PrintUrlString(q, STBUFLEFT, dtp.RollOff(),      SatipRollOffValues);
      ST(" S *") q += PrintUrlString(q, STBUFLEFT, dtp.System(),       SatipSystemValuesSat);
      ST("C  *") q += PrintUrlString(q, STBUFLEFT, dtp.System(),       SatipSystemValuesCable);