Improvements to delegates search.