first part of doctor search
fix merge conflicts