Improve content grabber regular expressions