Adding External Search Functionality - Complete