Fixed templates for query api