Fix helper query,create