Improve content grabber and add new rules