user orders fixes