Minor improvement on destination search to get the proper rate
Simplify and improve the customer selection sql