adding cleanup, generated queries
fixed query templates -- thx grahn
added fixed templates
merge conflicts resolved