merge sql from crawler branch