Refactored into EtsySearch