Remove custom encoding code for the query component