Update to add sorting by fields. Break out the html parsing into separate file