Refactoring: Searching has moved from storage to action