Fix result schema