Some improvements for better (but failed) Doctor's searching.