removed the use of queryTmpl #21