Data Query Change

fix some bug and change some data query way.