UHM-1729: Performance improvement to main patient search