added search
fixed shipment mode selection
updated fields ordering