improve search for one large customer, RT#39822