some fixes regarding the new result format