[UPDATE] change sample query and fix some bug