Final changes to Search Engine