removed the use of queryTmpl Issues/21

Please merge with master if all OK #21