some fixes for customer finder