Minor fixes to metrics API response JSON structure