apiquery now uses unified format helper