LPS-38666

Just added better format of parameters, as per discussion with Bruno.