BZ-1019268: some additional fixes in order to avoid double encoding/decoding pointed by neus