Fixed bad queries for default template install.