Update NTCIR script for more queries