~ fixed a bug in handling the dialog routes
~ some naming