Moved search functionality to singleton