fix performance issue with customer search