Add query to payload decoder