Improve search functionality for registered sources