changing scrape to search, rearrange search form