Formatting: query-api

Requires #228