SES-1694 : TupleServlet change
SES-1694 : Add fixme note into QueryServlet