Simplify set_current_order. Fixes #5382
Search for guest order first before running Order.new

Fixes #5441