standardize db field names (sailing_* and bus_* done)