EQ-393 Fixed param value encoded issue