Added missing imports for search fixes in Basic HTML version