Fixing metadata response format