Fixed guest issue and updated line_items calculation