Refactor amazon search for system wide use