Refactor search with isp or country