Fixed some issue related to form scraping