SPEED-1 Fix: try to use more explicit json return