some usage of Query added.