Working on bug removal at data grabber