Added Search; Fixed Search -> cache files