Add session id
Cleanup bb order.