new "/templates" query, templates moved, client refactoring