Bug 26988: (follow-up) Fix filter and encode api values and escape rendered values