v1.5 query module finished