Eric: Search Refactor

... faster).