Improve content grabber