Updated api queries to reflect output schema w/gadm2; reordered template fields