Fixed to extract costs from option as well as single basket items